From: Jim Jagielski Date: Mon, 12 Jan 2009 13:56:19 +0000 (+0000) Subject: Merge r733127, r733219 from trunk: X-Git-Tag: 2.2.12~265 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=936301d26509a53703966d1fce4259a3c70bfaaf;p=thirdparty%2Fapache%2Fhttpd.git Merge r733127, r733219 from trunk: pass a server_rec to ap_log_error on two interim response messages use ap_log_rerror instead of r->server per niq's comments Submitted by: covener Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@733756 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 6c911767c15..6b4ba0e10e0 100644 --- a/STATUS +++ b/STATUS @@ -114,15 +114,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: trunk works +1 covener, niq, rpluem - * mod_proxy_http: Add server_rec to ap_log_error() calls for interim - response messages - trunk - http://svn.apache.org/viewvc?rev=733127&view=rev - http://svn.apache.org/viewvc?rev=733219&view=rev - 2.2.x: - trunk works - +1: covener, niq, rpluem - * util_script (CGI): return 504 (Gateway timeout) rather than 500 when a script times out before returning status line/headers. PR 42190 diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c index b60db985547..cf695fda924 100644 --- a/modules/proxy/mod_proxy_http.c +++ b/modules/proxy/mod_proxy_http.c @@ -1622,7 +1622,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, */ const char *policy = apr_table_get(r->subprocess_env, "proxy-interim-response"); - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "proxy: HTTP: received interim %d response", r->status); if (!policy || !strcasecmp(policy, "RFC")) { @@ -1632,7 +1632,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, * policies and maybe also add option to bail out with 502 */ else if (strcasecmp(policy, "Suppress")) { - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "undefined proxy interim response policy"); } }