Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1089614 -
 /httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
Date: Wed, 06 Apr 2011 20:14:36 -0000
To: cvs@httpd.apache.org
From: trawick@apache.org
Message-Id: <20110406201436.31F562388901@eris.apache.org>

Author: trawick
Date: Wed Apr  6 20:14:35 2011
New Revision: 1089614

URL: http://svn.apache.org/viewvc?rev=1089614&view=rev
Log:
Log the OS socket (int) instead of the apr_socket_t *.

Modified:
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=1089614&r1=1089613&r2=1089614&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Wed Apr  6 20:14:35 2011
@@ -471,14 +471,14 @@ static int send_listeners_to_child(apr_p
     for (lr = ap_listeners; lr; lr = lr->next, ++lcnt) {
         apr_os_sock_t nsd;
         lpWSAProtocolInfo = apr_pcalloc(p, sizeof(WSAPROTOCOL_INFO));
-        apr_os_sock_get(&nsd,lr->sd);
+        apr_os_sock_get(&nsd, lr->sd);
         ap_log_error(APLOG_MARK, APLOG_INFO, APR_SUCCESS, ap_server_conf,
                      "Parent: Duplicating socket %d and sending it to child process %d",
                      nsd, dwProcessId);
         if (WSADuplicateSocket(nsd, dwProcessId,
                                lpWSAProtocolInfo) == SOCKET_ERROR) {
             ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), ap_server_conf,
-                         "Parent: WSADuplicateSocket failed for socket %d. Check the FAQ.", lr->sd );
+                         "Parent: WSADuplicateSocket failed for socket %d. Check the FAQ.", nsd);
             return -1;
         }
 
@@ -486,7 +486,7 @@ static int send_listeners_to_child(apr_p
                                       sizeof(WSAPROTOCOL_INFO), &BytesWritten))
                 != APR_SUCCESS) {
             ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
-                         "Parent: Unable to write duplicated socket %d to the child.", lr->sd );
+                         "Parent: Unable to write duplicated socket %d to the child.", nsd);
             return -1;
         }
     }