Merge r1923806 from trunk:

Fix variable declaration warning in scoreboard.c

Submitted by: Vladimír Chlup <vchlup redhat.com>
Github: closes #516

Reviewed by: rpluem, jorton, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926108 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 7288e1499b24d0a9d6cf7d484232afcb79530f17..a598de50031e09109d1391220068611884a3f233 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -205,14 +205,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                  undefined otherwise.
      rpluem says: Good catch. Added r1926091 and reset votes.
 
-  *) scoreboard.c: Fix variable declaration warning in scoreboard.c
-     Trunk version of patch:
-        https://svn.apache.org/r1923806
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1923806 ^/httpd/httpd/trunk .
-     +1: rpluem, jorton, ylavic
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/server/scoreboard.c b/server/scoreboard.c
index ec18281b21478b0f600553e1027c09f71fa937b3..adc97d8fffc16355990bc8e1766a3089f269f5d9 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -656,11 +656,11 @@ AP_DECLARE(void) ap_time_process_request(ap_sb_handle_t *sbh, int status)
 AP_DECLARE(void) ap_set_time_process_request(ap_sb_handle_t* const sbh,
                const apr_time_t timebeg,const apr_time_t timeend)
 {
+    worker_score *ws;
     if (!sbh || sbh->child_num < 0)
         return;
 
-    worker_score* const ws =
-       &ap_scoreboard_image->servers[sbh->child_num][sbh->thread_num];
+    ws = &ap_scoreboard_image->servers[sbh->child_num][sbh->thread_num];
     
     ws->start_time = timebeg;
     ws->stop_time = ws->last_used = timeend;