You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2025/06/04 07:37:33 UTC
svn commit: r1926108 - in /httpd/httpd/branches/2.4.x: ./ STATUS server/scoreboard.c
Author: rpluem
Date: Wed Jun 4 07:37:32 2025
New Revision: 1926108
URL: http://svn.apache.org/viewvc?rev=1926108&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/scoreboard.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1923806
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1926108&r1=1926107&r2=1926108&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 4 07:37:32 2025
@@ -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 ]
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=1926108&r1=1926107&r2=1926108&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/scoreboard.c (original)
+++ httpd/httpd/branches/2.4.x/server/scoreboard.c Wed Jun 4 07:37:32 2025
@@ -656,11 +656,11 @@ AP_DECLARE(void) ap_time_process_request
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;