Author: rpluem
Date: Tue Oct 3 05:52:56 2006
New Revision: 452465
URL: http://svn.apache.org/viewvc?view=rev&rev=452465
Log:
Merge r443503 from trunk:
* PROXY_WORKER_IS_INITIALIZED checks if PROXY_WORKER_INITIALIZED is set in
worker->s->status, but we need to check here if it is set in worker->status.
As PROXY_WORKER_INITIALIZED is set in worker->s->status in
ap_proxy_initialize_worker_share, which is called just before
ap_proxy_initialize_worker we never initialize the worker. This is very bad
as we create no reslist for the pool in this case.
Reviewed by: jim, rpluem, trawick
Modified:
httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?view=diff&rev=452465&r1=452464&r2=452465
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Tue Oct 3 05:52:56 2006
@@ -1667,7 +1667,7 @@
int mpm_threads;
#endif
- if (PROXY_WORKER_IS_INITIALIZED(worker)) {
+ if (worker->status & PROXY_WORKER_INITIALIZED) {
/* The worker is already initialized */
return APR_SUCCESS;
}
|