Commit 7e9bb18b authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Backport a logging change to make things clearer; includes jorton's r224721 fix.

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

modules/proxy/proxy_http.c

+5 −3
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static apr_status_t pass_brigade(apr_bucket_alloc_t *bucket_alloc, 
    status = ap_pass_brigade(origin->output_filters, b);

    if (status != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,

                     "proxy: pass request data failed to %pI (%s)",

                     "proxy: pass request body failed to %pI (%s)",

                     p_conn->addr, p_conn->name);

        return status;

    }
@@ -1075,8 +1075,10 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r, 


    if (status != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,

                     "proxy: request failed to %pI (%s)",

                     p_conn->addr, p_conn->name);

                     "proxy: pass request body failed to %pI (%s)"

                     " from %s (%s)",

                     p_conn->addr, p_conn->name ? p_conn->name: "",

                     c->remote_ip, c->remote_host ? c->remote_host: "");

        return status;

    }