Commit 18b88255 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

OK, while we ponder how best to reuse conn pools for workers, 

clean this section up.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356030 13f79535-47bb-0310-9956-ffa450edef68
parent a7a1e130

modules/proxy/proxy_util.c

+4 −10
Original line number Diff line number Diff line
@@ -1825,21 +1825,15 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, 
                           uri->fragment ? uri->fragment : "", NULL);

    }

    /*

     * Make sure that we pick the the correct and valid worker.

     * If a single keepalive connection triggers different workers,

     * then we have a problem (we don't select the correct one).

     * Do an expensive check in this case.

     * Do an expensive check in this case, where we compare the

     * the hostnames associated between the two.

     *

     * TODO: Handle this much better...

     */

    if (!conn->hostname) {

        if (proxyname) {

            conn->hostname = apr_pstrdup(conn->pool, proxyname);

            conn->port = proxyport;

        } else {

            conn->hostname = apr_pstrdup(conn->pool, uri->hostname);

            conn->port = uri->port;

        }

    } else if (!worker->is_address_reusable ||

    if (!conn->hostname || !worker->is_address_reusable ||   

         (r->connection->keepalives &&

         (r->proxyreq == PROXYREQ_PROXY || r->proxyreq == PROXYREQ_REVERSE) &&

         (strcasecmp(conn->hostname, uri->hostname) != 0) ) ) {