From: William A. Rowe Jr <wrowe@apache.org>
Date: Sun, 7 Aug 2005 21:57:56 +0000 (+0000)
Subject:   Prepare to backport r209836 whitespace changes; this is the one
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b37eaafdc69aac8af7d55c61c23101649397d57d;p=thirdparty%2Fapache%2Fhttpd.git

  Prepare to backport r209836 whitespace changes; this is the one
  minor code change to declare *buf once, obliterating the need for
  a number of code blocks throughout this function.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/proxy-reqbody-2.0.x@230704 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 57e31d99a23..2c6cca2c68a 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -1102,6 +1102,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                                             char *server_portstr) {
     conn_rec *c = r->connection;
     char buffer[HUGE_STRING_LEN];
+    const char *buf;
     char keepchar;
     request_rec *rp;
     apr_bucket *e;
@@ -1201,7 +1202,6 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                 return r->status;
 
             } else {
-                const char *buf;
 
                 /* can't have both Content-Length and Transfer-Encoding */
                 if (apr_table_get(r->headers_out, "Transfer-Encoding")
@@ -1270,7 +1270,6 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
 
         /* we must accept 3 kinds of date, but generate only 1 kind of date */
         {
-            const char *buf;
             if ((buf = apr_table_get(r->headers_out, "Date")) != NULL) {
                 apr_table_set(r->headers_out, "Date",
                               ap_proxy_date_canon(p, buf));
@@ -1289,7 +1288,6 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
          * ProxyPassReverse
          */
         {
-            const char *buf;
             if ((buf = apr_table_get(r->headers_out, "Location")) != NULL) {
                 apr_table_set(r->headers_out, "Location",
                               ap_proxy_location_reverse_map(r, conf, buf));
@@ -1305,7 +1303,6 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
         }
 
         if ((r->status == 401) && (conf->error_override != 0)) {
-            const char *buf;
             const char *wa = "WWW-Authenticate";
             if ((buf = apr_table_get(r->headers_out, wa))) {
                 apr_table_set(r->err_headers_out, wa, buf);