From 890ab5af282da97d07d605fd53ee681c7e7c1832 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 1 Oct 2013 11:51:44 +0000 Subject: [PATCH] Merge r1451849 from trunk: The 2 first patches from PR45355 have been ported Submitted by: jailletc36 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1528052 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 5 ----- support/ab.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/STATUS b/STATUS index 8c248dc944..42dc94c7ea 100644 --- a/STATUS +++ b/STATUS @@ -97,11 +97,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * ab: Fix units in HTML output - trunk: http://svn.apache.org/viewvc?view=revision&revision=1451849 - 2.4.x: trunk patch works (minus CHANGES) - +1: jailletc36, jim, trawick - * ab: Add a new -l parameter in order not to check the length of the responses. This can be usefull with dynamic pages. PR9945, PR27888, PR42040 diff --git a/support/ab.c b/support/ab.c index 75f35cfb01..dca3199afc 100644 --- a/support/ab.c +++ b/support/ab.c @@ -813,9 +813,9 @@ static void output_results(int sig) (double) totalread / 1024 / timetaken); if (send_body) { printf(" %.2f kb/s sent\n", - (double) totalposted / timetaken / 1024); + (double) totalposted / 1024 / timetaken); printf(" %.2f kb/s total\n", - (double) (totalread + totalposted) / timetaken / 1024); + (double) (totalread + totalposted) / 1024 / timetaken); } } @@ -1098,16 +1098,16 @@ static void output_html_results(void) trstring, tdstring, tdstring, (double) done / timetaken); printf("Transfer rate:" "%.2f kb/s received\n", - trstring, tdstring, tdstring, (double) totalread / timetaken); + trstring, tdstring, tdstring, (double) totalread / 1024 / timetaken); if (send_body) { printf(" " "%.2f kb/s sent\n", trstring, tdstring, tdstring, - (double) totalposted / timetaken); + (double) totalposted / 1024 / timetaken); printf(" " "%.2f kb/s total\n", trstring, tdstring, tdstring, - (double) (totalread + totalposted) / timetaken); + (double) (totalread + totalposted) / 1024 / timetaken); } } { @@ -1701,7 +1701,7 @@ static void test(void) exit(1); } #endif /* NOT_ASCII */ - + if (myhost) { /* This only needs to be done once */ if ((rv = apr_sockaddr_info_get(&mysa, myhost, APR_UNSPEC, 0, 0, cntxt)) != APR_SUCCESS) { @@ -1713,7 +1713,7 @@ static void test(void) } /* This too */ - if ((rv = apr_sockaddr_info_get(&destsa, connecthost, + if ((rv = apr_sockaddr_info_get(&destsa, connecthost, myhost ? mysa->family : APR_UNSPEC, connectport, 0, cntxt)) != APR_SUCCESS) { @@ -1920,7 +1920,7 @@ static void usage(const char *progname) #endif fprintf(stderr, " -Z ciphersuite Specify SSL/TLS cipher suite (See openssl ciphers)\n"); - fprintf(stderr, " -f protocol Specify SSL/TLS protocol\n"); + fprintf(stderr, " -f protocol Specify SSL/TLS protocol\n"); fprintf(stderr, " (" SSL2_HELP_MSG "SSL3, TLS1" TLS1_X_HELP_MSG " or ALL)\n"); #endif exit(EINVAL); -- 2.40.0