]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
mpm_unix: Follow up to r1821526.
authorYann Ylavic <ylavic@apache.org>
Fri, 19 Jan 2018 09:32:53 +0000 (09:32 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 19 Jan 2018 09:32:53 +0000 (09:32 +0000)
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

server/mpm_unix.c

index b7e16e502419706a3ff4850a7cb437fa362ab364..5a2f132a4a205fe7ae8581d6adb107541b0b46d2 100644 (file)
@@ -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);
 }