dreid 01/07/20 02:51:43
Modified: support ab.c
Log:
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...
Revision Changes Path
1.80 +11 -7 httpd-2.0/support/ab.c
Index: ab.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/ab.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ab.c 2001/07/19 16:40:42 1.79
+++ ab.c 2001/07/20 09:51:43 1.80
@@ -339,7 +339,9 @@
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 @@
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 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><%s></i> apache-2.0<br>\n",
AB_VERSION, "$Revision: 1.79 $");
+ printf(" This is ApacheBench, Version %s <i><%s></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 @@
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);
|