Commit 89acc4ac authored by Mladen Turk's avatar Mladen Turk
Browse files

Kill the pool cleanup when closing non cachable connection. 

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

modules/proxy/proxy_util.c

+11 −4
Original line number Diff line number Diff line
@@ -1665,10 +1665,14 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, 
        !worker->is_address_reusable) {

        /* TODO: Check if the connection can be reused

         */            

        if (conn->connection) {      

            if (conn->sock) {

                apr_socket_close(conn->sock);

                conn->sock = NULL;

            }

            apr_pool_cleanup_kill(conn->connection->pool, conn, connection_cleanup);

            conn->connection = NULL;

        }

        err = apr_sockaddr_info_get(&(conn->addr),

                                    conn->hostname, APR_UNSPEC,

                                    conn->port, 0,
@@ -1693,6 +1697,9 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, 
        conn->addr = worker->cp->addr;

        PROXY_THREAD_UNLOCK(worker);

    }

    else

        conn->addr = worker->cp->addr;



    if (err != APR_SUCCESS) {

        return ap_proxyerror(r, HTTP_BAD_GATEWAY,

                             apr_pstrcat(p, "DNS lookup failure for: ",