From 196a6e711e5595389f21000577ff0ccc06709adc Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Wed, 1 Nov 2006 20:20:42 +0000 Subject: [PATCH] * 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 Reviewed by: rpluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@470076 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/proxy/proxy_util.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 7cd53ff650..39253810f9 100644 --- a/CHANGES +++ b/CHANGES @@ -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 ] + *) 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. diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index c9a774e0af..a3d161994c 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -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; } /* -- 2.40.0