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

* Always retrieve conditional function. static variable might contain garbage... 

* Always retrieve conditional function. static variable might contain garbage if module was reloaded in a static build.

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

modules/proxy/balancers/mod_lbmethod_heartbeat.c

+0 −2
Changes for modules/proxy/balancers/mod_lbmethod_heartbeat.c: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -273,14 +273,12 @@ static proxy_worker *find_best_hb(proxy_balancer *balancer, 
        ap_get_module_config(r->server->module_config,

                             &lbmethod_heartbeat_module);



    if (!ap_proxy_retry_worker_fn) {

    ap_proxy_retry_worker_fn =

            APR_RETRIEVE_OPTIONAL_FN(ap_proxy_retry_worker);

    if (!ap_proxy_retry_worker_fn) {

        /* can only happen if mod_proxy isn't loaded */

        return NULL;

    }

    }



    apr_pool_create(&tpool, r->pool);

modules/proxy/mod_proxy_balancer.c

+0 −2
Changes for modules/proxy/mod_proxy_balancer.c: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -857,7 +857,6 @@ static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog, 
        return OK;

    }



    if (!ap_proxy_retry_worker_fn) {

    ap_proxy_retry_worker_fn =

            APR_RETRIEVE_OPTIONAL_FN(ap_proxy_retry_worker);

    if (!ap_proxy_retry_worker_fn) {
@@ -865,7 +864,6 @@ static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog, 
                     "mod_proxy must be loaded for mod_proxy_balancer");

        return !OK;

    }

    }



    /*

     * Get slotmem setups

modules/proxy/mod_proxy_http.c

+0 −2
Changes for modules/proxy/mod_proxy_http.c: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2171,7 +2171,6 @@ static int proxy_http_post_config(apr_pool_t *pconf, apr_pool_t *plog, 
        return OK;

    }



    if (!ap_proxy_clear_connection_fn) {

    ap_proxy_clear_connection_fn =

            APR_RETRIEVE_OPTIONAL_FN(ap_proxy_clear_connection);

    if (!ap_proxy_clear_connection_fn) {
@@ -2179,7 +2178,6 @@ static int proxy_http_post_config(apr_pool_t *pconf, apr_pool_t *plog, 
                     "mod_proxy must be loaded for mod_proxy_http");

        return !OK;

    }

    }



    return OK;

}