From: Graham Leggett Date: Mon, 2 Mar 2015 19:31:16 +0000 (+0000) Subject: Backport http://svn.apache.org/r1661913 X-Git-Tag: 2.4.13~374 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe4f18b50bfbb8946b5b282eeb467ed51f435085;p=thirdparty%2Fapache%2Fhttpd.git Backport http://svn.apache.org/r1661913 ab: Add missing longest request (100%) to CSV export. PR57614. Submitted by: ylavic Reviewed by: covener, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1663405 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index e4560d39da1..95541dab9f1 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.13 + *) ab: Add missing longest request (100%) to CSV export. + [Marcin Fabrykowski ] + *) mod_macro: Clear macros before initialization to avoid use-after-free on startup or restart when the module is linked statically. PR 57525 [apache.org tech.futurequest.net, Yann Ylavic] diff --git a/STATUS b/STATUS index 48cc9ebe6be..e2b3718a888 100644 --- a/STATUS +++ b/STATUS @@ -106,11 +106,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) ab: Add missing longest request (100%) to CSV export. PR57614. - trunk patch: http://svn.apache.org/r1661913 - 2.4.x patch: trunk works (modulo CHANGES) - +1: ylavic, covener, minfrin - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/support/ab.c b/support/ab.c index 03d12291544..7b13d202221 100644 --- a/support/ab.c +++ b/support/ab.c @@ -1038,7 +1038,7 @@ static void output_results(int sig) exit(1); } fprintf(out, "" "Percentage served" "," "Time in ms" "\n"); - for (i = 0; i < 100; i++) { + for (i = 0; i <= 100; i++) { double t; if (i == 0) t = ap_double_ms(stats[0].time);