You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2010/05/10 21:56:30 UTC
svn commit: r942878 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/proxy/mod_proxy_http.c
Author: sf
Date: Mon May 10 19:56:30 2010
New Revision: 942878
URL: http://svn.apache.org/viewvc?rev=942878&view=rev
Log:
Merge r921347, r921583 from trunk:
mod_proxy_http: log backend port in various places
PR: 48812
Submitted by: igalic
Reviewed by: sf, pgollucci, trawick
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=942878&r1=942877&r2=942878&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon May 10 19:56:30 2010
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.16
+ *) mod_proxy_http: Log the port of the remote server in various messages.
+ PR 48812. [Igor Galić <i galic brainsware org>]
*) apxs: Fix -A and -a options to ignore whitespace in httpd.conf
[Philip M. Gollucci]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=942878&r1=942877&r2=942878&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon May 10 19:56:30 2010
@@ -86,12 +86,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_proxy_http: Log backend server port in error messages
- Trunk patch: http://svn.apache.org/viewvc?rev=921347&view=rev
- http://svn.apache.org/viewvc?rev=921583&view=rev
- 2.2.x patch: Trunk patch works
- +1: sf, pgollucci, trawick
-
* Update apxs for perl 5.12
Trunk patch: http://svn.apache.org/viewvc?rev=932791&view=rev
2.2.x patch: trunk patch works
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c?rev=942878&r1=942877&r2=942878&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c Mon May 10 19:56:30 2010
@@ -1400,7 +1400,7 @@ apr_status_t ap_proxy_http_process_respo
if (len <= 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
"proxy: error reading status line from remote "
- "server %s", backend->hostname);
+ "server %s:%d", backend->hostname, backend->port);
if (rc == APR_TIMEUP) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
"proxy: read timeout");
@@ -1422,9 +1422,9 @@ apr_status_t ap_proxy_http_process_respo
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
"proxy: Closing connection to client because"
- " reading from backend server %s failed. Number"
- " of keepalives %i", backend->hostname,
- c->keepalives);
+ " reading from backend server %s:%d failed."
+ " Number of keepalives %i", backend->hostname,
+ backend->port, c->keepalives);
ap_proxy_backend_broke(r, bb);
/*
* Add an EOC bucket to signal the ap_http_header_filter
@@ -1455,8 +1455,9 @@ apr_status_t ap_proxy_http_process_respo
else if (!c->keepalives) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
"proxy: NOT Closing connection to client"
- " although reading from backend server %s"
- " failed.", backend->hostname);
+ " although reading from backend server %s:%d"
+ " failed.", backend->hostname,
+ backend->port);
}
return ap_proxyerror(r, HTTP_BAD_GATEWAY,
"Error reading from remote server");
@@ -1561,8 +1562,9 @@ apr_status_t ap_proxy_http_process_respo
*/
apr_table_unset(r->headers_out, "Content-Length");
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "proxy: server %s returned Transfer-Encoding"
- " and Content-Length", backend->hostname);
+ "proxy: server %s:%d returned Transfer-Encoding"
+ " and Content-Length", backend->hostname,
+ backend->port);
backend->close += 1;
}