Merge r1640040, r1640042 from trunk:

mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error
when parsing or forwarding the response fails.

Follow up to r1640040: CHANGES entry.
Submitted by: ylavic
Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index aeb37317d0dc5dff8433aa3cde035bcee33e17d9..0c7b2a03e6fbe306d88131ea41ef5b7103f453bc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,9 @@ Changes with Apache 2.4.11
      request headers earlier.  Adds "MergeTrailers" directive to restore
      legacy behavior.  [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
 
+  *) mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an
+     error when parsing or forwarding the response fails. [Yann Ylavic]
+
   *) mod_ssl: Fix a memory leak in case of graceful restarts with OpenSSL >= 0.9.8e
      PR 53435 [tadanori <tadanori2007 yahoo.com>, Sebastian Wiedenroth <wiedi frubar.net>]
 

diff --git a/STATUS b/STATUS
index c95a619975242a7058d559fb1049e15db22cc477..accba2050fd6fdfaac8861fc8351695598ac597e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -137,14 +137,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_proxy_wstunnel-aborted.patch
      +1: ylavic, covener, jim
 
-   * mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error
-     when parsing or forwarding the response fails.
-     trunk patch: http://svn.apache.org/r1640040
-                  http://svn.apache.org/r1640042
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, trawick, jim
-
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/modules/aaa/mod_authnz_fcgi.c b/modules/aaa/mod_authnz_fcgi.c
index 401fa9950788df0a20749c6c3775721f13e3c26e..51b15edd4a6e73e476700f2984f69147df23e2f5 100644 (file)
--- a/modules/aaa/mod_authnz_fcgi.c
+++ b/modules/aaa/mod_authnz_fcgi.c
@@ -642,6 +642,10 @@ static apr_status_t handle_response(const fcgi_provider_conf *conf,
                           "%d", fn, type);
             break;
         }
+        /* Leave on above switch's inner error. */
+        if (rv != APR_SUCCESS) {
+            break;
+        }
 
         /*
          * Read/discard any trailing padding.

diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index 9f570351638145d2cd4a80b7dedfc5ba8fe8b470..e35d6ccc7ff8c4be2d6bffcedd89d14905f74ce6 100644 (file)
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -681,6 +681,10 @@ recv_again:
                               "Got bogus record %d", type);
                 break;
             }
+            /* Leave on above switch's inner error. */
+            if (rv != APR_SUCCESS) {
+                break;
+            }
 
             if (plen) {
                 rv = get_data_full(conn, iobuf, plen);