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 2019/03/12 11:43:49 UTC
svn commit: r1855311 - in /httpd/httpd/trunk/include: ap_mmn.h scoreboard.h
Author: ylavic
Date: Tue Mar 12 11:43:49 2019
New Revision: 1855311
URL: http://svn.apache.org/viewvc?rev=1855311&view=rev
Log:
Follow up to r1855306: Axe bucket number from struct process_score.
Implies a Major bump.
Modified:
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/include/scoreboard.h
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1855311&r1=1855310&r2=1855311&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Tue Mar 12 11:43:49 2019
@@ -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
Modified: httpd/httpd/trunk/include/scoreboard.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/scoreboard.h?rev=1855311&r1=1855310&r2=1855311&view=diff
==============================================================================
--- httpd/httpd/trunk/include/scoreboard.h (original)
+++ httpd/httpd/trunk/include/scoreboard.h Tue Mar 12 11:43:49 2019
@@ -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,