Commit 9002f1c5 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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
parent a41bac19

include/ap_mmn.h

+3 −2
Original line number Diff line number Diff line
@@ -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

include/scoreboard.h

+0 −4
Original line number Diff line number Diff line
@@ -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,