httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/support ab.c
Date Mon, 18 Jun 2001 11:50:44 GMT
trawick     01/06/18 04:50:44

  Modified:    .        CHANGES
               support  ab.c
  Log:
  The patch fixes 2 things.
  * apr_terminate now has the right declaration so it can be used
  directly in atexit
  * Win2K gets a divde by zero error when heartbeatres is zero (reproduce via
      support\Debug\ab.exe -k -c 6 -n 100 localhost/
  
  Submitted by:   Ian Holsman <ianh@cnet.com>
  Reviewed by:    Jeff Trawick
  
  Revision  Changes    Path
  1.228     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.227
  retrieving revision 1.228
  diff -u -r1.227 -r1.228
  --- CHANGES	2001/06/18 05:36:29	1.227
  +++ CHANGES	2001/06/18 11:50:37	1.228
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.19-dev
   
  +  *) Fix an ab problem which could cause a divide-by-zero exception
  +     with certain invocations (e.g., ab -k -c 6 -n 100 localhost/).
  +     [Ian Holsman <ianh@cnet.com>]
  +
     *) Solve case-insensitive platforms' confusion about negotiated
        filenames, allowing files of differnt case to match in choosing
        the document to serve.  [William Rowe]
  
  
  
  1.71      +4 -9      httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- ab.c	2001/04/12 07:34:17	1.70
  +++ ab.c	2001/06/18 11:50:42	1.71
  @@ -1079,7 +1079,7 @@
   	}
   	if (done < requests) {
   	    struct data s;
  -	    if ((done) && (!(done % heartbeatres))) {
  +	    if (done && heartbeatres && !(done % heartbeatres)) {
   		fprintf(stderr, "Completed %ld requests\n", done);
   		fflush(stderr);
   	    }
  @@ -1289,14 +1289,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -	printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.70 $> apache-2.0");
  +	printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.71 $> 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.70 $");
  +	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n",
AB_VERSION, "$Revision: 1.71 $");
   	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");
  @@ -1438,11 +1438,6 @@
       return 0;
   }
   
  -static void terminate(void)
  -{
  -    apr_terminate();
  -}
  -
   /* ------------------------------------------------------- */
   
   /* sort out command-line args and call test */
  @@ -1465,7 +1460,7 @@
       hdrs[0] = '\0';
   
       apr_initialize();
  -    atexit(terminate);
  +    atexit(apr_terminate);
       apr_pool_create(&cntxt, NULL);
   
   #ifdef NOT_ASCII
  
  
  

Mime
View raw message