From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 17 Nov 2014 16:31:06 +0000 (+0000)
Subject: mpm_prefork: follow up to r1635521.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2c923c332e9a9582a7a38be832647dae5720e78;p=thirdparty%2Fapache%2Fhttpd.git

mpm_prefork: follow up to r1635521.
Avoid oddity on bucket_make_child_record overflow.

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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index ab78c49bd22..c8c82665837 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -858,10 +858,10 @@ static void startup_children(int number_to_start)
     }
 }
 
-static int bucket_make_child_record = -1;
-static int bucket_kill_child_record = -1;
 static void perform_idle_server_maintenance(apr_pool_t *p)
 {
+    static int bucket_make_child_record = -1;
+    static int bucket_kill_child_record = -1;
     int i;
     int idle_count;
     worker_score *ws;
@@ -939,8 +939,9 @@ static void perform_idle_server_maintenance(apr_pool_t *p)
             }
             for (i = 0; i < free_length; ++i) {
                 bucket_make_child_record++;
+                bucket_make_child_record %= num_buckets;
                 make_child(ap_server_conf, free_slots[i],
-                           bucket_make_child_record % num_buckets);
+                           bucket_make_child_record);
             }
             /* the next time around we want to spawn twice as many if this
              * wasn't good enough, but not if we've just done a graceful