Log the value of Status header lines in script responses rather than

than just the fixed header name of "Status".

Backport of r1362538 from trunk.

Submitted by: chrisd
Reviewed by: rpluem, rjung
Backported by: rjung

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

diff --git a/CHANGES b/CHANGES
index bc2f5f7aeda6e0cfb14ba27087d2abd182211acb..1daee9c5b980a028e8526563ac161d1ae3985825 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@ Changes with Apache 2.4.3
      possible XSS for a site where untrusted users can upload files to
      a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
 
+  *) core: Log value of Status header line in script responses rather
+     than the fixed header name.  [Chris Darroch]
+
   *) mpm_ssl: Fix handling of empty response from OCSP server.
      [Jim Meyering <meyering redhat.com>, Joe Orton]
 

diff --git a/server/util_script.c b/server/util_script.c
index f9f3e098039e78bc177769a6afdcc1223dda45f2..703d16009472b34d73e0b36e64c9c9d63380dfa9 100644 (file)
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -592,11 +592,11 @@ AP_DECLARE(int) ap_scan_script_header_err_core_ex(request_rec *r, char *buffer,
             if (!ap_is_HTTP_VALID_RESPONSE(cgi_status))
                 ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r,
                               "Invalid status line from script '%s': %s",
-                              apr_filepath_name_get(r->filename), w);
+                              apr_filepath_name_get(r->filename), l);
             else
                 ap_log_rerror(SCRIPT_LOG_MARK, APLOG_TRACE1, 0, r,
                               "Status line from script '%s': %s",
-                              apr_filepath_name_get(r->filename), w);
+                              apr_filepath_name_get(r->filename), l);
             r->status_line = apr_pstrdup(r->pool, l);
         }
         else if (!strcasecmp(w, "Location")) {