From: Ruediger Pluem <rpluem@apache.org>
Date: Sun, 2 Sep 2007 08:45:41 +0000 (+0000)
Subject: Merge r470076 from trunk:
X-Git-Tag: 2.2.6~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dabeca50396c45534e3882ba18742c849d78227b;p=thirdparty%2Fapache%2Fhttpd.git

Merge r470076 from trunk:

* Assign rv in the if statement to return the correct error code and
  more important an error code at all, as currently APR_SUCCESS is returned
  in the error case.

PR: 40865
Submitted by: Andrew Rucker Jones <arjones simultan.dyndns.org>
Reviewed by: niq, rpluem, fielding


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

diff --git a/CHANGES b/CHANGES
index b3519fd7eea..bb3ce4bf132 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.6
 
+  *) mod_proxy: Add a missing assignment in an error checking code path.
+     PR 40865. [Andrew Rucker Jones <arjones simultan.dyndns.org>]
+
   *) mod_proxy_connect: avoid segfault on DNS lookup failure.
      PR 40756 [Trevin Beattie <tbeattie boingo.com>]
 
@@ -15,7 +18,7 @@ Changes with Apache 2.2.6
      'Require ldap-*' directives, allowing authorization to be passed to lower 
      level modules (e.g. Require valid-user) 
      PR 43281 [Eric Covener]
-     
+
   *) mod_proxy: don't URLencode tilde in path component
      PR 38448 [Stijn Hoop <stijn sandcat.nl>]
 
diff --git a/STATUS b/STATUS
index cdf3d5200ae..0702268766f 100644
--- a/STATUS
+++ b/STATUS
@@ -79,11 +79,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * proxy_util: don't return unset error code
-     PR 40865
-     http://svn.apache.org/viewvc?view=rev&revision=470076
-     +1: niq, rpluem, fielding
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 615da10472a..a7880af4776 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -975,7 +975,10 @@ PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade
                 *eos = 1;
             }
             else {
-                if (APR_SUCCESS != apr_bucket_read(e, (const char **)&response, &len, APR_BLOCK_READ)) {
+                if (APR_SUCCESS != (rv = apr_bucket_read(e,
+                                                         (const char **)&response,
+                                                         &len,
+                                                         APR_BLOCK_READ))) {
                     return rv;
                 }
                 /*