You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2010/12/30 19:32:15 UTC
svn commit: r1053967 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Author: minfrin
Date: Thu Dec 30 18:32:15 2010
New Revision: 1053967
URL: http://svn.apache.org/viewvc?rev=1053967&view=rev
Log:
Change another variable that could be confused for conn_rec.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=1053967&r1=1053966&r2=1053967&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Thu Dec 30 18:32:15 2010
@@ -252,7 +252,7 @@ static void terminate_headers(apr_bucket
}
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
}
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) {