From: David Reid <dreid@apache.org>
Date: Fri, 20 Jul 2001 09:51:43 +0000 (+0000)
Subject: If we've spent the effort of getting some connections, when we die with an
X-Git-Tag: 2.0.21~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4ca0ddd1bd3f4a0d462d65a6a9cfe2dd24ada56;p=apache

If we've spent the effort of getting some connections, when we die with an
error at least inform the user how many we completed before dying.
Tidy up some formatting...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89639 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/support/ab.c b/support/ab.c
index 8b0bc64a2a..ec9d91e276 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -339,7 +339,9 @@ static void close_connection(struct connection * c);
 
 static void err(char *s)
 {
-    fprintf(stderr, "%s", s);
+    fprintf(stderr, "%s\n", s);
+    if (done)
+        printf("Total of %ld requests completed\n" , done);
     exit(1);
 }
 
@@ -352,6 +354,8 @@ static void apr_err(char *s, apr_status_t rv)
     fprintf(stderr,
 	    "%s: %s (%d)\n",
 	    s, apr_strerror(rv, buf, sizeof buf), rv);
+    if (done)
+        printf("Total of %ld requests completed\n" , done);
     exit(rv);
 }
 
@@ -1298,14 +1302,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-	printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.79 $> apache-2.0");
+	printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.80 $> apache-2.0");
 	printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
 	printf("Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/\n");
 	printf("\n");
     }
     else {
 	printf("<p>\n");
-	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.79 $");
+	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.80 $");
 	printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
 	printf(" Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/<br>\n");
 	printf("</p>\n<p>\n");
@@ -1499,11 +1503,11 @@ int main(int argc, const char *const argv[])
 	switch (c) {
 	case 's':
 #if USE_SSL
-	    ssl = 1;
-	    break;
+        ssl = 1;
+        break;
 #else
-	    fprintf(stderr, "SSL not compiled in; no https support\n");
-	    exit(1);
+        fprintf(stderr, "SSL not compiled in; no https support\n");
+        exit(1);
 #endif
 	case 'n':
 	    requests = atoi(optarg);