Commit a04a994a authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@452465 13f79535-47bb-0310-9956-ffa450edef68
parent 44f4e331

modules/proxy/proxy_util.c

+1 −1
Changes for modules/proxy/proxy_util.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1667,7 +1667,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_worker(proxy_worker *worker, ser 
    int mpm_threads;

#endif



    if (PROXY_WORKER_IS_INITIALIZED(worker)) {

    if (worker->status & PROXY_WORKER_INITIALIZED) {

        /* The worker is already initialized */

        return APR_SUCCESS;

    }