From: Jim Jagielski <jim@apache.org>
Date: Mon, 28 Aug 2006 18:57:09 +0000 (+0000)
Subject: Merge r437768 from trunk:
X-Git-Tag: 2.2.4~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4781747150a0e9dbe771296c0612a11011c25067;p=thirdparty%2Fapache%2Fhttpd.git

Merge r437768 from trunk:

Minor nit: why make the logic more complex than it needs to
be ? :)

Reviewed by: jim


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

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index a0980b9e4bd..39a0c563e4c 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1393,7 +1393,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
          * ProxyPassReverse/etc from here to ap_proxy_read_headers
          */
 
-        if ((r->status == 401) && (conf->error_override != 0)) {
+        if ((r->status == 401) && (conf->error_override)) {
             const char *buf;
             const char *wa = "WWW-Authenticate";
             if ((buf = apr_table_get(r->headers_out, wa))) {
@@ -1452,7 +1452,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
              * if we are overriding the errors, we can't put the content
              * of the page into the brigade
              */
-            if (conf->error_override == 0 || ap_is_HTTP_SUCCESS(r->status)) {
+            if (!conf->error_override || ap_is_HTTP_SUCCESS(r->status)) {
                 /* read the body, pass it to the output filters */
                 apr_read_type_e mode = APR_NONBLOCK_READ;
                 int finish = FALSE;