Author: jim
Date: Wed Feb 1 13:36:37 2012
New Revision: 1239125
URL: http://svn.apache.org/viewvc?rev=1239125&view=rev
Log:
Align 2.4 w/ trunk... since 2.4.0 was never released, API change is OK.
Modified:
httpd/httpd/branches/2.4.x/include/ap_mmn.h
httpd/httpd/branches/2.4.x/include/scoreboard.h
httpd/httpd/branches/2.4.x/server/scoreboard.c
Modified: httpd/httpd/branches/2.4.x/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_mmn.h?rev=1239125&r1=1239124&r2=1239125&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_mmn.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_mmn.h Wed Feb 1 13:36:37 2012
@@ -384,6 +384,7 @@
* ap_proxy_strmatch_path, ap_proxy_strmatch_domain,
* ap_proxy_table_unmerge(), proxy_lb_workers.
* 20120109.0 (2.4.1-dev) Changes sizeof(overrides_t) in core config.
+ * 20120109.1 (2.4.1-dev) remove sb_type in global_score.
*/
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -391,7 +392,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20120109
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 0 /* 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/branches/2.4.x/include/scoreboard.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/scoreboard.h?rev=1239125&r1=1239124&r2=1239125&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/scoreboard.h (original)
+++ httpd/httpd/branches/2.4.x/include/scoreboard.h Wed Feb 1 13:36:37 2012
@@ -120,7 +120,6 @@ struct worker_score {
typedef struct {
int server_limit;
int thread_limit;
- ap_scoreboard_e sb_type;
ap_generation_t running_generation; /* the generation of children which
* should still be serving requests.
*/
Modified: httpd/httpd/branches/2.4.x/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/scoreboard.c?rev=1239125&r1=1239124&r2=1239125&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/scoreboard.c (original)
+++ httpd/httpd/branches/2.4.x/server/scoreboard.c Wed Feb 1 13:36:37 2012
@@ -330,7 +330,7 @@ int ap_create_scoreboard(apr_pool_t *p,
ap_init_scoreboard(sb_mem);
}
- ap_scoreboard_image->global->sb_type = scoreboard_type = sb_type;
+ scoreboard_type = sb_type;
ap_scoreboard_image->global->running_generation = 0;
ap_scoreboard_image->global->restart_time = apr_time_now();
|