From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 19 Jan 2018 09:32:53 +0000 (+0000)
Subject: mpm_unix: Follow up to r1821526.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2951
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cf277ef5d5657dc972116c9811ae43fd59f18a7;p=thirdparty%2Fapache%2Fhttpd.git

mpm_unix: Follow up to r1821526.

Clear recycled_pools_count in ap_free_idle_pools().

[Reverted by r1821619]


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

diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index b7e16e50241..5a2f132a4a2 100644
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -1380,11 +1380,13 @@ void ap_free_idle_pools(fd_queue_info_t *queue_info)
     apr_pool_t *p;
 
     queue_info->max_recycled_pools = 0;
-    do {
+    for (;;) {
         ap_pop_pool(&p, queue_info);
-        if (p != NULL)
-            apr_pool_destroy(p);
-    } while (p != NULL);
+        if (p == NULL)
+            break;
+        apr_pool_destroy(p);
+    }
+    apr_atomic_set32(&queue_info->recycled_pools_count, 0);
 }