From: Jeff Trawick <trawick@apache.org>
Date: Mon, 26 Apr 2004 15:54:23 +0000 (+0000)
Subject: grab this from 2.1-dev:
X-Git-Tag: 2.0.50~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b979a712cf3e500b0fb10bb2b482cc33d3fba589;p=thirdparty%2Fapache%2Fhttpd.git

grab this from 2.1-dev:

mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer
size.

PR:             20617
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@103527 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 1d2e171145e..e0e9be27954 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.50
 
+  *) mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer
+     size.  PR 20617.  [Jesse Pelton <jsp pkc.com>]
+
   *) mod_dav: Fix a problem that could cause crashes when manipulating 
      locks on some platforms.  [Jeff Trawick]
 
diff --git a/STATUS b/STATUS
index d5864818f5d..c079f5cc7d4 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/04/26 15:45:52 $]
+Last modified at [$Date: 2004/04/26 15:54:22 $]
 
 Release:
 
@@ -353,11 +353,6 @@ PATCHES TO BACKPORT FROM 2.1
          nd replies: But if it can't be 0 the alternatives thereafter make no
            sense anymore, right?
 
-    * mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer
-      size.  PR 20617  [Jesse Pelton <jsp pkc.com>]
-        http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/arch/win32/mod_isapi.c?r1=1.96&r2=1.97
-      +1: trawick, stoddard, nd
-
     * 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
diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index a582aab377a..705ea150d7c 100644
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -540,7 +540,7 @@ int APR_THREAD_FUNC GetServerVariable (isapi_cid    *cid,
         int i;
 
         for (len = 0, i = 0; i < arr->nelts; i++) {
-            len += strlen(elts[i].key) + strlen(elts[i].val) + 2;
+            len += strlen(elts[i].key) + strlen(elts[i].val) + 3;
         }
   
         if (*buf_size < len + 1) {