From: Jim Jagielski <jim@apache.org>
Date: Mon, 24 Sep 2012 09:40:29 +0000 (+0000)
Subject: Merge r1376695, r1376700 from trunk:
X-Git-Tag: 2.4.4~569
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=524bdd994c75d4227b9960d78a4f301942c1c48a;p=apache

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 bbe8f831f5..128669caca 100644
--- 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 f1665d3643..9ce58714cc 100644
--- 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 703d160094..ca246dac67 100644
--- 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);
         }