httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1365753 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/scoreboard.c
Date Wed, 25 Jul 2012 21:17:17 GMT
Author: rjung
Date: Wed Jul 25 21:17:16 2012
New Revision: 1365753

URL: http://svn.apache.org/viewvc?rev=1365753&view=rev
Log: (empty)

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/scoreboard.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1294358

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1365753&r1=1365752&r2=1365753&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Jul 25 21:17:16 2012
@@ -1,5 +1,6 @@
                                                          -*- coding: utf-8 -*-
 
+<<<<<<< .working
 Changes with Apache 2.4.3
 
   *) SECURITY: CVE-2012-2687 (cve.mitre.org)
@@ -7,6 +8,9 @@ Changes with Apache 2.4.3
      possible XSS for a site where untrusted users can upload files to
      a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
 
+  *) core: Add the port number to the vhost's name in the scoreboard.
+     [Stefan Fritsch]
+
   *) mod_proxy: Fix ProxyPassReverse for balancer configurations.
      PR 45434.  [Joe Orton]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1365753&r1=1365752&r2=1365753&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jul 25 21:17:16 2012
@@ -88,11 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * scoreboard: Add the port number to the vhost's name.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1294358
-     2.4.x patch: trunk patch works
-     +1: rjung, jim, sf
-
    * mod_setenvif: Compile the regex used by is_header_regex() only once
      during startup This should save some memory, especially with .htaccess
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1343099

Modified: httpd/httpd/branches/2.4.x/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/scoreboard.c?rev=1365753&r1=1365752&r2=1365753&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/scoreboard.c (original)
+++ httpd/httpd/branches/2.4.x/server/scoreboard.c Wed Jul 25 21:17:16 2012
@@ -488,8 +488,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) {



Mime
View raw message