You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2012/04/09 11:28:15 UTC

svn commit: r1311172 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy_fcgi.c

Author: sf
Date: Mon Apr  9 09:28:14 2012
New Revision: 1311172

URL: http://svn.apache.org/viewvc?rev=1311172&view=rev
Log:
If there is an error reading the headers from the backend,
send an error to the client

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1311172&r1=1311171&r2=1311172&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Apr  9 09:28:14 2012
@@ -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]
 

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c?rev=1311172&r1=1311171&r2=1311172&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c Mon Apr  9 09:28:14 2012
@@ -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;
                             }