From b7522b422473d1928c1f63edf9500b3f3eef4d1b Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 11 Jul 2013 12:10:17 +0000 Subject: [PATCH] Merge r1501399 from trunk: We are no longer pre-grabbing. Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1502196 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 5 ----- modules/proxy/mod_proxy_balancer.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/STATUS b/STATUS index 72e1ed55a0..bc541c4820 100644 --- a/STATUS +++ b/STATUS @@ -131,11 +131,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works +1: jailletc36, jj, druggeri - * mod_proxy_balancer: We are no-longer using PREGRAB. - trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1501399 - 2.4.x patch: trunk patch works - +1: jim, druggeri, wrowe - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c index 177de5a2f2..0f45be7a8b 100644 --- a/modules/proxy/mod_proxy_balancer.c +++ b/modules/proxy/mod_proxy_balancer.c @@ -780,9 +780,9 @@ static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog, continue; } if (conf->bal_persist) { - type = AP_SLOTMEM_TYPE_PREGRAB | AP_SLOTMEM_TYPE_PERSIST; + type = AP_SLOTMEM_TYPE_PERSIST; } else { - type = AP_SLOTMEM_TYPE_PREGRAB; + type = 0; } if (conf->balancers->nelts) { conf->max_balancers = conf->balancers->nelts + conf->bgrowth; -- 2.50.1