On 6/3/25 10:02 AM, ic...@apache.org wrote: > Author: icing > Date: Tue Jun 3 08:02:35 2025 > New Revision: 1926080 > > URL: http://svn.apache.org/viewvc?rev=1926080&view=rev > Log: > Merge /httpd/httpd/trunk:r1923754 > > *) scoreboard/mod_http2: record durations of HTTP/2 requests. > PR 69579 [Pierre Brochard <pierre.brochard.1...@m4x.org>] > > > Added: > httpd/httpd/branches/2.4.x/changes-entries/pr69579.txt > - copied unchanged from r1923754, > httpd/httpd/trunk/changes-entries/pr69579.txt > Modified: > httpd/httpd/branches/2.4.x/ (props changed) > 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/modules/http2/h2_mplx.c > httpd/httpd/branches/2.4.x/server/scoreboard.c > > 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=1926080&r1=1926079&r2=1926080&view=diff > ============================================================================== > --- httpd/httpd/branches/2.4.x/server/scoreboard.c (original) > +++ httpd/httpd/branches/2.4.x/server/scoreboard.c Tue Jun 3 08:02:35 2025 > @@ -653,6 +653,22 @@ 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) > +{ > + if (!sbh || sbh->child_num < 0) > + return; > + > + worker_score* const ws = > + &ap_scoreboard_image->servers[sbh->child_num][sbh->thread_num]; Unfortunately r1923806 is missing (I missed this) and hence the gcc 12 maintainer-mode job fails :-(: /home/runner/work/httpd/httpd/server/scoreboard.c:662:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] 662 | worker_score* const ws = | ^~~~~~~~~~~~ cc1: all warnings being treated as errors I just proposed r1923806 for backport in r1926094. > + > + ws->start_time = timebeg; > + ws->stop_time = ws->last_used = timeend; > + > + if (ap_extended_status) > + ws->duration += timeend - timebeg; > +} > + > AP_DECLARE(int) ap_update_global_status(void) > { > #ifdef HAVE_TIMES > > > Regards Rüdiger
