apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r583012 - in /apr/apr/trunk: CHANGES file_io/win32/readwrite.c
Date Mon, 08 Oct 2007 23:59:14 GMT
Author: trawick
Date: Mon Oct  8 16:59:13 2007
New Revision: 583012

URL: http://svn.apache.org/viewvc?rev=583012&view=rev
Log:
apr_file_write() on Windows: Fix return code when writing to a non-
blocking pipe would have blocked.

The read equivalent already used APR_EAGAIN.  This fixes a
discrepancy with the Unix implementation.

PR:           43563
Submitted by: Eric Covener <covener gmail.com>
Reviewed by:  trawick


Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/file_io/win32/readwrite.c

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=583012&r1=583011&r2=583012&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Mon Oct  8 16:59:13 2007
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.3.0
 
+  *) apr_file_write() on Windows: Fix return code when writing to a non-
+     blocking pipe would have blocked.  PR 43563. 
+     [Eric Covener <covener gmail.com>]
+
   *) Introduce APR_NO_FILE as an option to apr_procattr_io_set() for any 
      of the three stdio streams to cause the corresponding streams to be 
      closed to the child process.  This becomes effective in 1.3.0 across

Modified: apr/apr/trunk/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/win32/readwrite.c?rev=583012&r1=583011&r2=583012&view=diff
==============================================================================
--- apr/apr/trunk/file_io/win32/readwrite.c (original)
+++ apr/apr/trunk/file_io/win32/readwrite.c Mon Oct  8 16:59:13 2007
@@ -354,7 +354,7 @@
                         rv = APR_SUCCESS;
                         break;
                     case WAIT_TIMEOUT:
-                        rv = APR_TIMEUP;
+                        rv = (timeout_ms == 0) ? APR_EAGAIN : APR_TIMEUP;
                         break;
                     case WAIT_FAILED:
                         rv = apr_get_os_error();



Mime
View raw message