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

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

diff --git a/CHANGES b/CHANGES
index bbe8f831f5da70b080d9abf347235d2639a2540e..128669caca234fce83484be13406d72cefd08328 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/STATUS b/STATUS
index f1665d3643b1c90cf316fa23425ec124e12fa2a8..9ce58714cca1668c77bb8e61124e8c05a696ab33 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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>

diff --git a/server/util_script.c b/server/util_script.c
index 703d16009472b34d73e0b36e64c9c9d63380dfa9..ca246dac67953261bac6e3f41c8c38836d9213ac 100644 (file)
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -591,11 +591,11 @@ AP_DECLARE(int) ap_scan_script_header_err_core_ex(request_rec *r, char *buffer,
             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);
         }