apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r583014 - in /apr/apr/branches/1.2.x: CHANGES file_io/win32/readwrite.c
Date Tue, 09 Oct 2007 00:04:02 GMT
Author: trawick
Date: Mon Oct  8 17:04:01 2007
New Revision: 583014

URL: http://svn.apache.org/viewvc?rev=583014&view=rev
Log:
merge r583012 from trunk

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/branches/1.2.x/CHANGES
    apr/apr/branches/1.2.x/file_io/win32/readwrite.c

Modified: apr/apr/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/CHANGES?rev=583014&r1=583013&r2=583014&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.2.x/CHANGES [utf-8] Mon Oct  8 17:04:01 2007
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.2.12
 
+  *) 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>]
+
   *) Cause apr_file_dup2() on Win32 to update the MSVCRT psuedo-stdio
      handles for fd-based and FILE * based I/O.  [William Rowe]
 

Modified: apr/apr/branches/1.2.x/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/file_io/win32/readwrite.c?rev=583014&r1=583013&r2=583014&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/file_io/win32/readwrite.c (original)
+++ apr/apr/branches/1.2.x/file_io/win32/readwrite.c Mon Oct  8 17:04:01 2007
@@ -348,7 +348,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