From: Stefan Fritsch <sf@apache.org>
Date: Mon, 10 May 2010 19:56:30 +0000 (+0000)
Subject: Merge r921347, r921583 from trunk:
X-Git-Tag: 2.2.16~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd1f1ef98554aa147221135263d2812d51245023;p=thirdparty%2Fapache%2Fhttpd.git

Merge r921347, r921583 from trunk:

mod_proxy_http: log backend port in various places

PR: 48812
Submitted by: igalic
Reviewed by: sf, pgollucci, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@942878 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 4e8cf710915..ca3c92f743f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
diff --git a/STATUS b/STATUS
index 4c95ccd93dc..ed33b5a3ea7 100644
--- a/STATUS
+++ b/STATUS
@@ -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
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 7e4767f9187..555a3b81404 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1400,7 +1400,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
         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_response(apr_pool_t * p, request_rec *r,
 
                 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_response(apr_pool_t * p, request_rec *r,
             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_response(apr_pool_t * p, request_rec *r,
                  */
                 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;
             }