httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1364271 - in /httpd/httpd/branches/2.4.x: ./ CHANGES server/util_script.c
Date Sun, 22 Jul 2012 12:00:22 GMT
Author: rjung
Date: Sun Jul 22 12:00:22 2012
New Revision: 1364271

URL: http://svn.apache.org/viewvc?rev=1364271&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/server/util_script.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1362538

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1364271&r1=1364270&r2=1364271&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun Jul 22 12:00:22 2012
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/server/util_script.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util_script.c?rev=1364271&r1=1364270&r2=1364271&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/util_script.c (original)
+++ httpd/httpd/branches/2.4.x/server/util_script.c Sun Jul 22 12:00:22 2012
@@ -592,11 +592,11 @@ AP_DECLARE(int) ap_scan_script_header_er
             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")) {



Mime
View raw message