Re: cvs commit: apache-2.0/src/modules/mpm/mpmt_pthread mpmt_pthread.c

[rb...@covalent.net]

On 23 Jun 2000 trawick@locus.apache.org wrote:

> trawick     00/06/23 11:02:17
> 
>   Modified:    src/modules/mpm/mpmt_pthread mpmt_pthread.c
>   Log:
>   Bring back the hokey call to ap_create_tcp_socket() so mpmt_pthread
>   works again.  It is completely hosed at the moment.
>   
>   Todo: remove the need for this call.

Argh!!!!  I was committing the real fix just as you committed this.  I'll
fix it now.

Ryan


>   
>   Revision  Changes    Path
>   1.94      +13 -1     apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
>   
>   Index: mpmt_pthread.c
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
>   retrieving revision 1.93
>   retrieving revision 1.94
>   diff -u -r1.93 -r1.94
>   --- mpmt_pthread.c	2000/06/22 19:46:23	1.93
>   +++ mpmt_pthread.c	2000/06/23 18:02:16	1.94
>   @@ -736,7 +736,19 @@
>        /* Set up the pollfd array */
>        listensocks = ap_pcalloc(pchild,
>    			    sizeof(*listensocks) * (num_listensocks + 1));
>   -    ap_put_os_sock(&listensocks[0], &pipe_of_death[0], pchild);
>   +
>   +    /* It is a horrible crime to use ap_create_tcp_socket() here, but it
>   +     * keeps ap_put_os_sock() from doing getsockname() on the pipe of death
>   +     * (which won't work).
>   +     * TODO - remove the need for such a hack!  Jeff owns this problem.
>   +     */
>   +    ap_create_tcp_socket(&listensocks[0], pchild);
>   +    rv = ap_put_os_sock(&listensocks[0], &pipe_of_death[0], pchild);
>   +    if (rv != APR_SUCCESS) {
>   +        ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf,
>   +                     "ap_put_os_sock() failed for the pipe of death");
>   +        clean_child_exit(APEXIT_CHILDFATAL);
>   +    }
>        for (lr = ap_listeners, i = 1; i <= num_listensocks; lr = lr->next, ++i)
>    	listensocks[i]=lr->sd;
>    
>   
>   
>   
> 


_______________________________________________________________________________
Ryan Bloom                        	rbb@apache.org
406 29th St.
San Francisco, CA 94131
-------------------------------------------------------------------------------