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

size.

PR:              20617
Submitted by:	 Jesse Pelton <jsp pkc.com>
Reviewed by:	 Jeff Trawick

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

diff --git a/CHANGES b/CHANGES
index 0032095031b0dfa53364fd711d181f44b4e2d74b..96733f9c8207209c8461ebed458fa807b889ee9e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_isapi: GetServerVariable("ALL_RAW") returned the wrong buffer
+     size.  PR 20617  [Jesse Pelton <jsp pkc.com>]
+
   *) The whole codebase was relicensed and is now available under
      the Apache License, Version 2.0 (http://www.apache.org/licenses).
      [Apache Software Foundation]

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index ac4b6c7d6a4dab035f17a0eadc4aa5d98d8224a0..e7e3017fa661687a7bafaa883b9eb30fe0087998 100644 (file)
--- 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) {