From: Graham Leggett <minfrin@apache.org>
Date: Thu, 30 Dec 2010 18:32:15 +0000 (+0000)
Subject: Change another variable that could be confused for conn_rec.
X-Git-Tag: 2.3.11~300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4275788f593fc2fe65ef17d2bd6cfd912db12efc;p=apache

Change another variable that could be confused for conn_rec.


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

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 9aa168697f..5a221429e7 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -252,7 +252,7 @@ static void terminate_headers(apr_bucket_alloc_t *bucket_alloc,
 }
 
 static int pass_brigade(apr_bucket_alloc_t *bucket_alloc,
-                                 request_rec *r, proxy_conn_rec *conn,
+                                 request_rec *r, proxy_conn_rec *p_conn,
                                  conn_rec *origin, apr_bucket_brigade *bb,
                                  int flush)
 {
@@ -265,12 +265,12 @@ static int pass_brigade(apr_bucket_alloc_t *bucket_alloc,
     }
     apr_brigade_length(bb, 0, &transferred);
     if (transferred != -1)
-        conn->worker->s->transferred += transferred;
+        p_conn->worker->s->transferred += transferred;
     status = ap_pass_brigade(origin->output_filters, bb);
     if (status != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
                      "proxy: pass request body failed to %pI (%s)",
-                     conn->addr, conn->hostname);
+                     p_conn->addr, p_conn->hostname);
         if (origin->aborted) {
             if (strcmp(apr_table_get(origin->notes,
                                      "SSL_connect_rv"), "err") == 0) {