Merge r1311172, r1331243 from trunk:

If there is an error reading the headers from the backend,
send an error to the client

add PR reference

Submitted by: sf
Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index 1403bb031825b1af00652d924b7cee02b1769e1f..4f25bb67ab66361da3816029f34edb9d761b485f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@
 
 Changes with Apache 2.4.3
 
+  *) mod_proxy_fcgi: If there is an error reading the headers from the
+     backend, send an error to the client. PR 52879. [Stefan Fritsch]
+
 Changes with Apache 2.4.2
 
   *) SECURITY: CVE-2012-0883 (cve.mitre.org)

diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index d0df5fa12fb7a50728aa6df045ea18daae2529a9..0f844163dc9b9008ae838587c1b06192392c0418 100644 (file)
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -748,10 +748,10 @@ recv_again:
                                 apr_brigade_cleanup(ob);
                                 tmp_b = apr_bucket_eos_create(c->bucket_alloc);
                                 APR_BRIGADE_INSERT_TAIL(ob, tmp_b);
+                                r->status = status;
                                 ap_pass_brigade(r->output_filters, ob);
                                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01070)
                                               "Error parsing script headers");
-                                r->status = status;
                                 rv = APR_EINVAL;
                                 break;
                             }