mod_isapi: Handle "HTTP/1.1 200 OK" style status lines correctly, the

  token parser worked while the resulting length was misinterpreted.
  We were also off by one in apr_cpystrn which demands room for the
  trailing null be counted.

PR: 29098
Submitted by: Brock Bland <bbland serena.com>

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

diff --git a/CHANGES b/CHANGES
index fffc93111a994b3eff4b3ce693b53403839923e1..263e3cbd451c895ff9e5c07c46cc130a41637c33 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) mod_isapi: Handle "HTTP/1.1 200 OK" style status lines correctly, the
+     token parser worked while the resulting length was misinterpreted.
+     PR 29098 [Brock Bland <bbland serena.com>]
+
   *) mod_isapi: Return 0 (failure) for more of the various ap_pass_brigade
      attempts to stream the response at the client.  PR 30022 [William Rowe]
 

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 224047e66858e634c0aade5122e33a416567bee0..e4ec5d004e69aabe51a76e1a57281318e40e4f27 100644 (file)
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -682,7 +682,7 @@ static apr_ssize_t send_response_header(isapi_cid *cid,
              * or the http/x.x xxx message format
              */
             if (toklen && apr_isdigit(*stattok)) {
-                statlen -= toklen;
+                statlen = toklen;
                 stat = stattok;
             }
         }