You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/01/19 12:23:05 UTC
svn commit: r1821632 - /httpd/httpd/trunk/server/mpm_fdqueue.c
Author: ylavic
Date: Fri Jan 19 12:23:05 2018
New Revision: 1821632
URL: http://svn.apache.org/viewvc?rev=1821632&view=rev
Log:
mpm_fdqueue: follow up to r1821624.
Clear recycled_pools_count in ap_free_idle_pools().
Modified:
httpd/httpd/trunk/server/mpm_fdqueue.c
Modified: httpd/httpd/trunk/server/mpm_fdqueue.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_fdqueue.c?rev=1821632&r1=1821631&r2=1821632&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_fdqueue.c (original)
+++ httpd/httpd/trunk/server/mpm_fdqueue.c Fri Jan 19 12:23:05 2018
@@ -286,11 +286,13 @@ void ap_free_idle_pools(fd_queue_info_t
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);
}