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

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

diff --git a/CHANGES b/CHANGES
index 4a5f33570c1d3ee2474bbc6901b74b8953e1fd04..a803691852b883ad874722fad0de790faf76ae1a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]

diff --git a/STATUS b/STATUS
index bcc300c4ef48f079bdb728217b41f5ea5fedeaab..4b9b0e482364815ad7b2f34e1c3a32e5f5d8f55f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/05/25 23:45:45 $]
+Last modified at [$Date: 2004/05/26 11:50:42 $]
 
 Release:
 
@@ -392,11 +392,6 @@ PATCHES TO BACKPORT FROM 2.1
           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

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 0ed08aa930053906695eee3fb9a2b9e4edd24102..fed41609af32d373ca21405f273aa1539a92ba91 100644 (file)
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -684,7 +684,7 @@ static apr_ssize_t send_response_header(isapi_cid *cid,
         }
         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;
     }