Add CVS Revision number to ab.c to allow for detecting changes

which were not marked by a version number update. Additionally,
display base repository name (apache-2.0)

Also, merge revision 1.34 of the 1.3 branch:
 Made sure ApacheBench (ab) performs no more requests than
 specified on command line (option -n).

Submitted by: Jim Cox <jc@superlink.net>
Reviewed by: Ralf S. Engelschall
PR: 4839

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

diff --git a/support/ab.c b/support/ab.c
index 1f92ba18cd275bc46c48a211b4bcd4e7f2f31330..15fff6e85dd7f89f0b99ca0298bae8f02eb2469d 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -97,7 +97,7 @@
  *   only an issue for loopback usage
  */
 
-#define VERSION "1.3b"
+#define VERSION "1.3c"
 
 /*  -------------------------------------------------------------------- */
 
@@ -550,7 +550,8 @@ static void start_connect(struct connection * c)
     }
 
     /* connected first time */
-    write_request(c);
+    c->state = STATE_CONNECTING;
+    FD_SET(c->fd, &writebits);
 }
 
 /* --------------------------------------------------------- */
@@ -881,14 +882,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-       printf("This is ApacheBench, Version %s\n", VERSION);
+       printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.5 $> apache-2.0");
        printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
        printf("Copyright (c) 1998-1999 The Apache Group, http://www.apache.org/\n");
        printf("\n");
     }
     else {
        printf("<p>\n");
-       printf(" This is ApacheBench, Version %s<br>\n", VERSION);
+       printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", VERSION, "$Revision: 1.5 $");
        printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
        printf(" Copyright (c) 1998-1999 The Apache Group, http://www.apache.org/<br>\n");
        printf("</p>\n<p>\n");