From: Stefan Fritsch <sf@apache.org>
Date: Mon, 27 Feb 2012 22:08:52 +0000 (+0000)
Subject: Add the port number to the vhost's name in the scoreboard
X-Git-Tag: 2.5.0-alpha~7433
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6e62d6f04ab5c4cca42c7abca4a4c3b0b32e173;p=apache

Add the port number to the vhost's name in the scoreboard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294358 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 9b7512573b..c2e9afdcc7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 
diff --git a/server/scoreboard.c b/server/scoreboard.c
index 42019955c0..1a6a9844bc 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -487,8 +487,9 @@ static int update_child_status_internal(int child_num,
                         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) {