Commit 90743625 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Revert r1831218, the API garantees slotmem_attach() is called in child_init(). 

r1831394 is the right follow to r1830800 to preserve "inherited" slotmems in
children processes.

While at it, comment on the expectations from mod_proxy_balancer w.r.t.
slotmem_attach() implementations, and eventually how we could improve the API
later (w/o backporting to 2.4.x).



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

modules/proxy/mod_proxy_balancer.c

+15 −3
Changes for modules/proxy/mod_proxy_balancer.c: 15 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -1885,14 +1885,26 @@ static void balancer_child_init(apr_pool_t *p, server_rec *s) 
        proxy_server_conf *conf = (proxy_server_conf *)ap_get_module_config(sconf, &proxy_module);

        apr_status_t rv;



        if (conf->balancers->nelts && !conf->bslot) {

        if (conf->balancers->nelts) {

            apr_size_t size;

            unsigned int num;

            storage->attach(&(conf->bslot), conf->id, &size, &num, p);

            /* In 2.4.x we rely on the provider to return either the same

             * in/out &bslot, a valid new one, or NULL for failure/exit().

             * TODO? for 2.6+/3.x we possibly could consider returned status

             * to be real failures, but e.g. NOTFOUND/ENOSHM* to continue with

             * existing conf->bslot (even when the returned one is NULL).

             * Hence handle the slotmem reuse it here where we know it's valid

             * both for fork()ed post_config()s and MPM winnt-like ones (run in

             * child process too). The provider tells what it attached or not, 

             * and if not whether the child should stop (fatal) or continue

             * with the "inherited" configuration.

             */

            rv = storage->attach(&conf->bslot, conf->id, &size, &num, p);

            if (!conf->bslot) {

                ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01205) "slotmem_attach failed");

                ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01205) "slotmem_attach failed");

                exit(1); /* Ugly, but what else? */

            }

            (void)rv;

        }



        balancer = (proxy_balancer *)conf->balancers->elts;