:) > On Jan 31, 2018, at 9:25 AM, [email protected] wrote: > > Author: ylavic > Date: Wed Jan 31 14:25:53 2018 > New Revision: 1822806 > > URL: http://svn.apache.org/viewvc?rev=1822806&view=rev > Log: > Revert r1822800 and r1822804. > > All was already there, I just misread name vs sname :/ > > > Modified: > httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c > > Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=1822806&r1=1822805&r2=1822806&view=diff > ============================================================================== > --- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original) > +++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Wed Jan 31 14:25:53 > 2018 > @@ -792,7 +792,7 @@ static int balancer_post_config(apr_pool > (s->defn_name ? s->defn_name : "?"), > s->defn_line_number, > (s->error_fname ? s->error_fname : > DEFAULT_ERRORLOG)); > - conf->id = apr_psprintf(pconf, "balancers_p%x", > + conf->id = apr_psprintf(pconf, "p%x", > ap_proxy_hashfunc(id, > PROXY_HASHFUNC_DEFAULT)); > if (conf->bslot) { > /* Shared memory already created for this proxy_server_conf. > @@ -834,7 +834,7 @@ static int balancer_post_config(apr_pool > /* now that we have the right id, we need to redo the sname field > */ > ap_pstr2_alnum(pconf, balancer->s->name + sizeof(BALANCER_PREFIX) > - 1, > &sname); > - sname = apr_pstrcat(ptemp, conf->id, "_", sname, NULL); > + sname = apr_pstrcat(pconf, conf->id, "_", sname, NULL); > PROXY_STRNCPY(balancer->s->sname, sname); /* We know this will > succeed */ > > balancer->max_workers = balancer->workers->nelts + > balancer->growth; > @@ -876,13 +876,12 @@ static int balancer_post_config(apr_pool > } > > /* create slotmem slots for workers */ > - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01184) > - "Doing workers create: %s (%s), %d, %d [%u]", > - balancer->s->name, sname, > + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01184) > "Doing workers create: %s (%s), %d, %d [%u]", > + balancer->s->name, balancer->s->sname, > (int)ALIGNED_PROXY_WORKER_SHARED_SIZE, > (int)balancer->max_workers, i); > > - rv = storage->create(&new, sname, > + rv = storage->create(&new, balancer->s->sname, > ALIGNED_PROXY_WORKER_SHARED_SIZE, > balancer->max_workers, type, pconf); > if (rv != APR_SUCCESS) { > >
