From 35a6b06a299fb2c8a094e62383e4e640329ee500 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Sun, 31 Aug 2014 16:08:33 +0000 Subject: [PATCH] Merge r1618401 from trunk: mod_proxy_fcgi: Fix faulty logging of large amounts of stderr from the application. PR: 56858 Submitted by: Manuel Mausz 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 --- CHANGES | 3 +++ STATUS | 6 ------ modules/proxy/mod_proxy_fcgi.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index b2b4c87872..60a0e222d1 100644 --- 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 ] + *) 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 7ab2850b15..0394c3e591 100644 --- 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 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 e2fb59cdc3..9d4eb90b5f 100644 --- 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) { -- 2.50.1