httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1389260 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/util_script.c
Date Mon, 24 Sep 2012 09:40:29 GMT
Author: jim
Date: Mon Sep 24 09:40:29 2012
New Revision: 1389260

URL: http://svn.apache.org/viewvc?rev=1389260&view=rev
Log:
Merge r1376695, r1376700 from trunk:

Apply the same length limit when logging Status header values
as used when logging invalid header lines.

Application of a limit on logged header data suggested by Jeff Trawick.


Catch up change log with r1376695.

Submitted by: chrisd
Reviewed/backported by: jim

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

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1376695,1376700

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1389260&r1=1389259&r2=1389260&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Sep 24 09:40:29 2012
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.4
 
+  *) core: Apply length limit when logging Status header values.
+     [Jeff Trawick, Chris Darroch]
+
   *) mod_proxy_balancer: The nonce is only derived from the UUID iff
      not set via the 'nonce' balancer param. [Jim Jagielski]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1389260&r1=1389259&r2=1389260&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Sep 24 09:40:29 2012
@@ -89,12 +89,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * core: Apply length limit when logging Status header values.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1376695
-                  http://svn.apache.org/viewvc?view=revision&revision=1376700
-     2.4.x patch: trunk patch works
-     +1: chrisd, covener, humbedooh
-
    * default conf: Comment out the default configuration stanza that removes DNT
                    request headers from IE10 clients (revert r1371878).  PR53845
                    <CALK=YjMGPNHBqNiad-ghzcEzxDovQgYOpjpSSyXmN=r74v43qg@mail.gmail.com>

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=1389260&r1=1389259&r2=1389260&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/util_script.c (original)
+++ httpd/httpd/branches/2.4.x/server/util_script.c Mon Sep 24 09:40:29 2012
@@ -591,11 +591,11 @@ AP_DECLARE(int) ap_scan_script_header_er
             r->status = cgi_status = atoi(l);
             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",
+                              "Invalid status line from script '%s': %.30s",
                               apr_filepath_name_get(r->filename), l);
             else
                 ap_log_rerror(SCRIPT_LOG_MARK, APLOG_TRACE1, 0, r,
-                              "Status line from script '%s': %s",
+                              "Status line from script '%s': %.30s",
                               apr_filepath_name_get(r->filename), l);
             r->status_line = apr_pstrdup(r->pool, l);
         }



Mime
View raw message