From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 12 Mar 2019 11:43:49 +0000 (+0000)
Subject: Follow up to r1855306: Axe bucket number from struct process_score.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8073a525c9c013ccacc3b289f0cf21c33ebf35e2;p=thirdparty%2Fapache%2Fhttpd.git

Follow up to r1855306: Axe bucket number from struct process_score.

Implies a Major bump.


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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 6a20d4f41d5..7d400b3db63 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -609,14 +609,15 @@
  * 20180906.1 (2.5.1-dev)  Don't export ap_filter_recycle() anymore
  * 20180906.2 (2.5.1-dev)  Add ap_state_dir_relative()
  * 20180906.3 (2.5.1-dev)  Add ap_dir_nofnmatch() and ap_dir_fnmatch().
+ * 20191203.1 (2.5.1-dev)  Axe bucket number from struct process_score
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20180906
+#define MODULE_MAGIC_NUMBER_MAJOR 20191203
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 3                 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1                 /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/include/scoreboard.h b/include/scoreboard.h
index 0d722107894..47d036d0148 100644
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -148,10 +148,6 @@ struct process_score {
     apr_uint32_t lingering_close;   /* async connections in lingering close */
     apr_uint32_t keep_alive;        /* async connections in keep alive */
     apr_uint32_t suspended;         /* connections suspended by some module */
-    int bucket;  /* Listener bucket used by this child; this field is DEPRECATED
-                  * and no longer updated by the MPMs (i.e. always zero) from
-                  * 2.5.x and later.
-                  */
 };
 
 /* Scoreboard is now in 'local' memory, since it isn't updated once created,