Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 49684 invoked by uid 500); 15 Jul 2002 06:34:36 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 49673 invoked from network); 15 Jul 2002 06:34:36 -0000 Date: 15 Jul 2002 06:34:34 -0000 Message-ID: <20020715063434.42769.qmail@icarus.apache.org> From: wrowe@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/network_io/win32 sendrecv.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N wrowe 2002/07/14 23:34:33 Modified: network_io/win32 sendrecv.c Log: The last transpostion of ->timeout into apr_time fixed a bug identified by TANAKA Koichi , where we used our old ms based timeout within the timeval structure usec member. This patch fixes the only exception to needing the timeout_ms. NOTICE that we first test that *timeout* is positive, since only then will timeout_ms contain anything worth using. Revision Changes Path 1.55 +1 -1 apr/network_io/win32/sendrecv.c Index: sendrecv.c =================================================================== RCS file: /home/cvs/apr/network_io/win32/sendrecv.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sendrecv.c 4 Jun 2002 04:50:44 -0000 1.54 +++ sendrecv.c 15 Jul 2002 06:34:32 -0000 1.55 @@ -356,7 +356,7 @@ (status == APR_FROM_OS_ERROR(WSA_IO_PENDING))) { rv = WaitForSingleObject(wait_event, (DWORD)(sock->timeout >= 0 - ? sock->timeout : INFINITE)); + ? sock->timeout_ms : INFINITE)); if (rv == WAIT_OBJECT_0) { status = APR_SUCCESS; if (!disconnected) {