httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1372370 - in /httpd/httpd/branches/2.4.x: ./ STATUS server/mpm/winnt/child.c
Date Mon, 13 Aug 2012 11:29:13 GMT
Author: rjung
Date: Mon Aug 13 11:29:13 2012
New Revision: 1372370

URL: http://svn.apache.org/viewvc?rev=1372370&view=rev
Log:
mpm_winnt: Tweak a message added in r750567 so that the accept thread
logs the physical address it listens on instead of hostname|*.

Backport of r1364138 from trunk.

Submitted by: trawick
Reviewed by: rjung, humbedooh
Backported by: rjung

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1372370&r1=1372369&r2=1372370&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Aug 13 11:29:13 2012
@@ -88,12 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mpm_winnt: Tweak a message added in r750567 so that the accept thread
-     logs the physical address it listens on instead of hostname|*.
-     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1364138
-     2.4.x patch: trunk patch works
-     +1: rjung, trawick, humbedooh
-
    * htpasswd: Use correct file mode for checking if file is writable.
      Also switch to the non-deprecated APR_FOPEN_* flags.
      PR: 45923

Modified: httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c?rev=1372370&r1=1372369&r2=1372370&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c Mon Aug 13 11:29:13 2012
@@ -352,9 +352,8 @@ reinit: /* target of data or connect upo
     }
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00334)
-                 "Child: Accept thread listening on %s:%d using AcceptFilter %s",
-                 lr->bind_addr->hostname ? lr->bind_addr->hostname : "*",
-                 lr->bind_addr->port, accf_name);
+                 "Child: Accept thread listening on %pI using AcceptFilter %s",
+                 lr->bind_addr, accf_name);
 
     while (!shutdown_in_progress) {
         if (!context) {



Mime
View raw message