svn commit: r1294358 - in /httpd/httpd/trunk: CHANGES server/scoreboard.c

[sf...@apache.org]

Author: sf
Date: Mon Feb 27 22:08:52 2012
New Revision: 1294358

URL: http://svn.apache.org/viewvc?rev=1294358&view=rev
Log:
Add the port number to the vhost's name in the scoreboard

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/scoreboard.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1294358&r1=1294357&r2=1294358&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Feb 27 22:08:52 2012
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) core: Add the port number to the vhost's name in the scoreboard.
+     [Stefan Fritsch]
+
   *) mpm_event: Don't do a blocking write when starting a lingering close
      from the listener thread. PR 52229. [Stefan Fritsch]
 

Modified: httpd/httpd/trunk/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=1294358&r1=1294357&r2=1294358&view=diff
==============================================================================
--- httpd/httpd/trunk/server/scoreboard.c (original)
+++ httpd/httpd/trunk/server/scoreboard.c Mon Feb 27 22:08:52 2012
@@ -487,8 +487,9 @@ static int update_child_status_internal(
                         REMOTE_NOLOOKUP, NULL), sizeof(ws->client));
             copy_request(ws->request, sizeof(ws->request), r);
             if (r->server) {
-                apr_cpystrn(ws->vhost, r->server->server_hostname,
-                            sizeof(ws->vhost));
+                apr_snprintf(ws->vhost, sizeof(ws->vhost), "%s:%d",
+                             r->server->server_hostname,
+                             r->connection->local_addr->port);
             }
         }
         else if (c) {