From: Jim Jagielski <jim@apache.org>
Date: Tue, 9 Jul 2013 17:41:33 +0000 (+0000)
Subject: We are no longer pre-grabbing.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6683312be48ba5488ca589d45b226ea8cfd74eb;p=thirdparty%2Fapache%2Fhttpd.git

We are no longer pre-grabbing.


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

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 177de5a2f2f..0f45be7a8b0 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;