Start getting extended status working again.

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

diff --git a/include/scoreboard.h b/include/scoreboard.h
index 3e70fb96fbe27241b140c5bb3650eb58119e7eaa..00002c3ba5fc09ecb5f6d4b5479f7249e73496b5 100644 (file)
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -225,12 +225,14 @@ typedef struct {
 
 AP_DECLARE(int) ap_exists_scoreboard_image(void);
 AP_DECLARE(void) ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e t);
+AP_DECLARE(void) ap_increment_counts(int child_num, int thread_num, request_rec *r);
+
 apr_status_t ap_cleanup_scoreboard(void *d);
 
 AP_DECLARE(void) reopen_scoreboard(apr_pool_t *p);
 
 void ap_sync_scoreboard_image(void);
-void increment_counts(int child_num, int thread_num, request_rec *r);
+
 void update_scoreboard_global(void);
 AP_DECLARE(int) find_child_by_pid(apr_proc_t *pid);
 int ap_update_child_status(int child_num, int thread_num, int status, request_rec *r);

diff --git a/server/connection.c b/server/connection.c
index bf8b8b97ee3888071a0a32e9c46cf51e4dd7461b..6b69711822cbe5b1dd5f3c431c3fc7079c4a7367 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -245,6 +245,9 @@ AP_CORE_DECLARE_NONSTD(int) ap_process_http_connection(conn_rec *c)
        if (r->status == HTTP_OK)
            ap_process_request(r);
 
+        if (ap_extended_status)
+            ap_increment_counts(AP_CHILD_THREAD_FROM_ID(c->id), r);
+
        if (!c->keepalive || c->aborted)
            break;
 

diff --git a/server/scoreboard.c b/server/scoreboard.c
index 9ce6970debd78e76dab13b64695ca68285a79638..fac57786d91d9b1ad5fc5b162015610ea6d384ec 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -231,7 +231,7 @@ void update_scoreboard_global(void)
 #endif
 }
 
-void increment_counts(int child_num, int thread_num, request_rec *r)
+AP_DECLARE(void) ap_increment_counts(int child_num, int thread_num, request_rec *r)
 {
     short_score *ss;