diff options
| author | Arno Töll <arno@debian.org> | 2012-10-20 02:58:14 +0200 |
|---|---|---|
| committer | Arno Töll <arno@debian.org> | 2012-10-20 02:58:14 +0200 |
| commit | 5c4fba3ffbe778bdffe10a93d04821579601a020 (patch) | |
| tree | 91be9a7f99d3988ba48b0a619479aa46a3234191 /server/mpm/winnt | |
| parent | 8f9c15530d0bc387af114619b3ff3f930eb23d3c (diff) | |
| download | apache2-5c4fba3ffbe778bdffe10a93d04821579601a020.tar.gz | |
Imported Upstream version 2.4.3upstream/2.4.3
Diffstat (limited to 'server/mpm/winnt')
| -rw-r--r-- | server/mpm/winnt/child.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index 2e42071f..ae34b07b 100644 --- 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) { @@ -650,11 +649,12 @@ reinit: /* target of data or connect upon too many AcceptEx failures */ } } - sockinfo.os_sock = &context->accept_socket; - sockinfo.local = context->sa_server; - sockinfo.remote = context->sa_client; - sockinfo.family = context->sa_server->sa_family; - sockinfo.type = SOCK_STREAM; + sockinfo.os_sock = &context->accept_socket; + sockinfo.local = context->sa_server; + sockinfo.remote = context->sa_client; + sockinfo.family = context->sa_server->sa_family; + sockinfo.type = SOCK_STREAM; + sockinfo.protocol = IPPROTO_TCP; /* Restore the state corresponding to apr_os_sock_make's default * assumption of timeout -1 (really, a flaw of os_sock_make and * os_sock_put that it does not query to determine ->timeout). |