httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Aaron Bannert <aa...@clove.org>
Subject Re: cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Tue, 25 Dec 2001 23:13:29 GMT
Ugh! I've been meaning to patch the prototype for apr_thread_exit for
a long time (so that it takes an apr_status_t instead of a pointer), but
it got lost in the shuffle. I'll see if I can fix this sometime this week
so we don't have to have ackward &rv stuff like this.

-aaron


On Sun, Dec 23, 2001 at 01:56:49PM -0000, dreid@apache.org wrote:
> dreid       01/12/23 05:56:49
> 
>   Modified:    server/mpm/worker worker.c
>   Log:
>   This fixes a segfault that showed up on BeOS and may catch other systems.
>   
>   Revision  Changes    Path
>   1.51      +4 -2      httpd-2.0/server/mpm/worker/worker.c
>   
>   Index: worker.c
>   ===================================================================
>   RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
>   retrieving revision 1.50
>   retrieving revision 1.51
>   diff -u -r1.50 -r1.51
>   --- worker.c	2001/12/19 14:49:22	1.50
>   +++ worker.c	2001/12/23 13:56:49	1.51
>   @@ -790,7 +790,8 @@
>        worker_thread_count--;
>        apr_thread_mutex_unlock(worker_thread_count_mutex);
>    
>   -    apr_thread_exit(thd, APR_SUCCESS);
>   +    rv = APR_SUCCESS;
>   +    apr_thread_exit(thd, &rv);
>        return NULL;
>    }
>    
>   @@ -879,7 +880,8 @@
>         *  "life_status" is almost right, but it's in the worker's structure, and 
>         *  the name could be clearer.   gla
>         */
>   -    apr_thread_exit(thd, APR_SUCCESS);
>   +    rv = APR_SUCCESS;
>   +    apr_thread_exit(thd, &rv);
>        return NULL;
>    }
>    
>   
>   
>   

Mime
View raw message