cvs commit: apache-2.0/src/support ab.c

[martin]

martin      99/10/27 15:36:20

  Modified:    src/support ab.c
  Log:
  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 <[EMAIL PROTECTED]>
  Reviewed by: Ralf S. Engelschall
  PR: 4839
  
  Revision  Changes    Path
  1.5       +5 -4      apache-2.0/src/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/src/support/ab.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ab.c      1999/10/11 20:25:07     1.4
  +++ ab.c      1999/10/27 22:36:20     1.5
  @@ -97,7 +97,7 @@
    *   only an issue for loopback usage
    */
   
  -#define VERSION "1.3b"
  +#define VERSION "1.3c"
   
   /*  -------------------------------------------------------------------- */
   
  @@ -550,7 +550,8 @@
       }
   
       /* connected first time */
  -    write_request(c);
  +    c->state = STATE_CONNECTING;
  +    FD_SET(c->fd, &writebits);
   }
   
   /* --------------------------------------------------------- */
  @@ -881,14 +882,14 @@
   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");