Merge r1618401 from trunk:

mod_proxy_fcgi: Fix faulty logging of large amounts of stderr from the
application.

PR: 56858
Submitted by: Manuel Mausz <manuel-asf mausz.at>
Reviewed by: trawick

Submitted by: trawick
Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index b2b4c878723ed6df63e7af7a950f51dde46b5f39..60a0e222d163e88a8353b5e91577b83b22a165ff 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.11
 
+  *) mod_proxy_fcgi: Fix faulty logging of large amounts of stderr from the
+     application.  PR 56858.  [Manuel Mausz <manuel-asf mausz.at>]
+
   *) mod_proxy_http: Proxy responses with error status and
      "ProxyErrorOverride On" hang until proxy timeout.
      PR53420 [Rainer Jung]

diff --git a/STATUS b/STATUS
index 7ab2850b15963c77588f66a6626acc182ac5ea89..0394c3e59139804afbc460f2c8f27563b45ba18a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -101,12 +101,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy_fcgi: Fix faulty logging of large amounts of stderr from the
-     application.  PR 56858.
-     trunk patch: http://svn.apache.org/r1618401
-     2.4.x patch: trunk works modulo CHANGES
-     +1: trawick, ylavic, covener
-
    * core: Avoid useless warning message when parsing a section guarded by
      <IfDefine foo> if $(foo) is used within the section.  PR56503
      trunk patch: http://svn.apache.org/r1618541

diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index e2fb59cdc3dd88c00839e19bf8ba8021a1de4fe7..9d4eb90b5f0571640ed4371e25f143c8dc90a1ff 100644 (file)
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -663,7 +663,7 @@ recv_again:
                 /* TODO: Should probably clean up this logging a bit... */
                 if (clen) {
                     ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01071)
-                                  "Got error '%s'", iobuf);
+                                  "Got error '%.*s'", (int)readbuflen, iobuf);
                 }
 
                 if (clen > readbuflen) {