From: Jim Jagielski Date: Wed, 2 Mar 2016 13:51:32 +0000 (+0000) Subject: Merge r1732954 from trunk: X-Git-Tag: 2.4.19~115 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=936b95e1343fcc3888aac5694d1a15b04341b9ed;p=apache Merge r1732954 from trunk: mod_proxy: add missing APLOGNO()s. Submitted by: ylavic Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1733289 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 6516881f83..ee8e8de7b8 100644 --- a/STATUS +++ b/STATUS @@ -112,12 +112,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) proxy_util: Add missing APLOGNO()s from r1732266 (already backported - to 2.4.x/19) - trunk patch: http://svn.apache.org/r1732954 - 2.4.x patch: trunk works (modulo docs/log-message-tags) - +1: ylavic, icing, jim - *) core: Add missing APLOGNO() from r1729495 (somehow r1725395 was backported in r1729495 but without this "server/core.c" change) trunk patch: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?r1=1725395&r2=1725394&pathrev=1725395&view=patch diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index f22c8940dc..e2f33c04de 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -3699,7 +3699,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_transfer_between_connections( #ifdef DEBUGGING len = -1; apr_brigade_length(bb_i, 0, &len); - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(03306) "ap_proxy_transfer_between_connections: " "read %" APR_OFF_T_FMT " bytes from %s", len, name); @@ -3726,13 +3726,13 @@ PROXY_DECLARE(apr_status_t) ap_proxy_transfer_between_connections( } rv = ap_pass_brigade(c_o->output_filters, bb_o); if (rv != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(03307) "ap_proxy_transfer_between_connections: " "error on %s - ap_pass_brigade", name); } } else if (!APR_STATUS_IS_EAGAIN(rv) && !APR_STATUS_IS_EOF(rv)) { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(03308) "ap_proxy_transfer_between_connections: " "error on %s - ap_get_brigade", name);