www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Change another variable that could be confused for conn_rec.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053967 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Graham Leggett
2010-12-30 18:32:15 +00:00
parent 4a8f0cdfbc
commit 4275788f59
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/proxy/mod_proxy_http.c
View File

@@ -252,7 +252,7 @@ static void terminate_headers(apr_bucket_alloc_t *bucket_alloc,
} }
static int pass_brigade(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, conn_rec *origin, apr_bucket_brigade *bb,
int flush) int flush)
{ {
@@ -265,12 +265,12 @@ static int pass_brigade(apr_bucket_alloc_t *bucket_alloc,
} }
apr_brigade_length(bb, 0, &transferred); apr_brigade_length(bb, 0, &transferred);
if (transferred != -1) if (transferred != -1)
conn->worker->s->transferred += transferred; p_conn->worker->s->transferred += transferred;
status = ap_pass_brigade(origin->output_filters, bb); status = ap_pass_brigade(origin->output_filters, bb);
if (status != APR_SUCCESS) { if (status != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server, ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
"proxy: pass request body failed to %pI (%s)", "proxy: pass request body failed to %pI (%s)",
conn->addr, conn->hostname); p_conn->addr, p_conn->hostname);
if (origin->aborted) { if (origin->aborted) {
if (strcmp(apr_table_get(origin->notes, if (strcmp(apr_table_get(origin->notes,
"SSL_connect_rv"), "err") == 0) { "SSL_connect_rv"), "err") == 0) {