If there is an error reading the headers from the backend,

send an error to the client

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1311172 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 9172a1668af3bee82e9ff860752b879050b06c43..dbf53664ed30c1fd697d61b6dc8c7c54700b8296 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_proxy_fcgi: If there is an error reading the headers from the
+     backend, send an error to the client. [Stefan Fritsch]
+
   *) mod_rewrite: Fix RewriteCond integer checks to be parsed correctly.
      PR 53023. [Axel Reinhold <apache freakout.de>, André Malo]
 

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;
                             }