Commit 4f2a65fd authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* 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: rpluem


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) mod_proxy: Add a missing assignment in an error checking code path.









     PR 40865. [Andrew Rucker Jones <arjones simultan.dyndns.org>]

















  *) mod_mem_cache: Increase the minimum and default value for









     MCacheMinObjectSize from 0 to 1, as a MCacheMinObjectSize of 0 does not









     make sense and leads to a division by zero.  PR 40576.


































modules/proxy/proxy_util.c



+4
−1



























Changes for modules/proxy/proxy_util.c: 4 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -1032,7 +1032,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;









                }









                /*