You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2004/05/26 13:50:43 UTC

cvs commit: httpd-2.0/modules/arch/win32 mod_isapi.c

trawick     2004/05/26 04:50:43

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/arch/win32 Tag: APACHE_2_0_BRANCH mod_isapi.c
  Log:
  back port this from 2.1-dev:
  
    mod_isapi: send_response_header() failed to copy status string's
    last character.
  
  PR:		20619
  Submitted by:	Jesse Pelton <jsp pkc.com>
  Reviewed by:	trawick, stoddard, nd
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.284 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.283
  retrieving revision 1.988.2.284
  diff -u -r1.988.2.283 -r1.988.2.284
  --- CHANGES	25 May 2004 16:31:20 -0000	1.988.2.283
  +++ CHANGES	26 May 2004 11:50:42 -0000	1.988.2.284
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.50
   
  +  *) mod_isapi: send_response_header() failed to copy status string's 
  +     last character.  PR 20619.  [Jesse Pelton <jsp pkc.com>]
  +
     *) Fix a segfault when requests for shared memory fails and returns
        NULL. Fix a segfault caused by a lack of bounds checking on the
        cache. PR 24801 [Graham Leggett]
  
  
  
  1.751.2.883 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.882
  retrieving revision 1.751.2.883
  diff -u -r1.751.2.882 -r1.751.2.883
  --- STATUS	25 May 2004 23:45:45 -0000	1.751.2.882
  +++ STATUS	26 May 2004 11:50:42 -0000	1.751.2.883
  @@ -392,11 +392,6 @@
   	   which implements this, keeping UseCanonicalName Off
   	   "as is". 
   
  -    * mod_isapi: send_response_header() failed to copy status string's 
  -      last character.  PR 20619.  [Jesse Pelton <jsp pkc.com>]
  -      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/arch/win32/mod_isapi.c?r1=1.97&r2=1.98
  -      +1: trawick, stoddard, nd
  -
       * Unix MPMs: Stop dropping connections when the file descriptor
         is at least FD_SETSIZE
           os/unix/unixd.c: r1.63
  
  
  
  No                   revision
  No                   revision
  1.88.2.8  +1 -1      httpd-2.0/modules/arch/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_isapi.c,v
  retrieving revision 1.88.2.7
  retrieving revision 1.88.2.8
  diff -u -r1.88.2.7 -r1.88.2.8
  --- mod_isapi.c	26 Apr 2004 15:58:31 -0000	1.88.2.7
  +++ mod_isapi.c	26 May 2004 11:50:43 -0000	1.88.2.8
  @@ -684,7 +684,7 @@
           }
           newstat = apr_palloc(cid->r->pool, statlen + 9);
           strcpy(newstat, "Status: ");
  -        apr_cpystrn(newstat + 8, stat, statlen);
  +        apr_cpystrn(newstat + 8, stat, statlen + 1);
           stat = newstat;
           statlen += 8;
       }