httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/support ab.c
Date Sat, 12 Jul 2003 12:44:12 GMT
nd          2003/07/12 05:44:12

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               support  Tag: APACHE_2_0_BRANCH ab.c
  Log:
  Fix NULL-pointer issue in ab when parsing an incomplete or non-HTTP
  response.
  
  PR: 21085
  Submitted by:	Glenn Nielsen <glenn@apache.org>
  Reviewed by:    Brian Pane, Erik Abele
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.131 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.130
  retrieving revision 1.988.2.131
  diff -u -r1.988.2.130 -r1.988.2.131
  --- CHANGES	9 Jul 2003 11:47:13 -0000	1.988.2.130
  +++ CHANGES	12 Jul 2003 12:44:09 -0000	1.988.2.131
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.48
   
  +  *) Fix NULL-pointer issue in ab when parsing an incomplete or non-HTTP
  +     response. PR 21085. [Glenn Nielsen <glenn@apache.org>, André Malo]
  +
     *) mod_rewrite: Perform child initialization on the rewrite log lock.
        This fixes a log corruption issue when flock-based serialization
        is used (e.g., FreeBSD).  [Jeff Trawick]
  
  
  
  1.751.2.360 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.359
  retrieving revision 1.751.2.360
  diff -u -r1.751.2.359 -r1.751.2.360
  --- STATUS	9 Jul 2003 15:31:49 -0000	1.751.2.359
  +++ STATUS	12 Jul 2003 12:44:10 -0000	1.751.2.360
  @@ -236,11 +236,6 @@
           config.layout: r1.22
         +1: nd, brianp, erikabele, kess
   
  -    * ab: fix NULL-pointer issue when parsing incomplete response. PR 21085.
  -      (2.0 + 1.3)
  -        support/ab.c: r1.124
  -      +1: nd, brianp, erikabele
  -
       * ab: catch out of memory (reasoning report ID 29)
           support/ab.c: r1.125
         +1: nd, erikabele
  
  
  
  No                   revision
  No                   revision
  1.121.2.2 +10 -4     httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.121.2.1
  retrieving revision 1.121.2.2
  diff -u -r1.121.2.1 -r1.121.2.2
  --- ab.c	3 Feb 2003 17:32:08 -0000	1.121.2.1
  +++ ab.c	12 Jul 2003 12:44:11 -0000	1.121.2.2
  @@ -1475,8 +1475,14 @@
   
   	    /* check response code */
   	    part = strstr(c->cbuff, "HTTP");	/* really HTTP/1.x_ */
  -	    strncpy(respcode, (part + strlen("HTTP/1.x_")), 3);
  -	    respcode[3] = '\0';
  +            if (part && strlen(part) > strlen("HTTP/1.x_")) {
  +                strncpy(respcode, (part + strlen("HTTP/1.x_")), 3);
  +                respcode[3] = '\0';
  +            }
  +            else {
  +                strcpy(respcode, "500");
  +            }
  +
   	    if (respcode[0] != '2') {
   		err_response++;
   		if (verbosity >= 2)
  
  
  

Mime
View raw message