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

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

diff --git a/STATUS b/STATUS
index a80697bc61b7dc0c727d4c330145161048eceae7..89638947ce8bf2d48886333e253ae07964a64a35 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 2e42071fed4972638fefefdcb488362d923068ee..8859fac319fbe523e470b5b439883354827efddf 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -352,9 +352,8 @@ reinit: /* target of data or connect upon too many AcceptEx failures */
     }
 
     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) {