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

diff --git a/STATUS b/STATUS
index 72e1ed55a064005ed59630cf91e82cf12ae39f29..bc541c4820df30f5e86e1ebfe7c1bd8e5425f46a 100644 (file)
--- 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 177de5a2f2ff8a105bb2772eeca25ea8020ca66c..0f45be7a8b01589cc3e67f0676806a1af9b31324 100644 (file)
--- 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;