apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r920017 - in /apr/apr/branches/1.4.x: ./ file_io/unix/open.c include/apr_file_io.h
Date Sun, 07 Mar 2010 15:24:36 GMT
Author: minfrin
Date: Sun Mar  7 15:24:36 2010
New Revision: 920017

URL: http://svn.apache.org/viewvc?rev=920017&view=rev
Log:
Backport r920016:
Enable platform specific support for the opening of a file or
pipe in non blocking module through the APR_FOPEN_NONBLOCK flag.

Modified:
    apr/apr/branches/1.4.x/   (props changed)
    apr/apr/branches/1.4.x/file_io/unix/open.c
    apr/apr/branches/1.4.x/include/apr_file_io.h

Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  7 15:24:36 2010
@@ -1 +1,2 @@
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,905040,908427,910419,917837-917838
+/apr/apr/branches/1.5.x:920016
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,905040,908427,910419,917819,917837-917838,920016

Modified: apr/apr/branches/1.4.x/file_io/unix/open.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/file_io/unix/open.c?rev=920017&r1=920016&r2=920017&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/file_io/unix/open.c (original)
+++ apr/apr/branches/1.4.x/file_io/unix/open.c Sun Mar  7 15:24:36 2010
@@ -135,6 +135,12 @@
     }
 #endif
 
+#ifdef O_NONBLOCK
+    if (flag & APR_FOPEN_NONBLOCK) {
+        oflags |= O_NONBLOCK;
+    }
+#endif
+
 #ifdef O_CLOEXEC
     /* Introduced in Linux 2.6.23. Silently ignored on earlier Linux kernels.
      */

Modified: apr/apr/branches/1.4.x/include/apr_file_io.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_file_io.h?rev=920017&r1=920016&r2=920017&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_file_io.h (original)
+++ apr/apr/branches/1.4.x/include/apr_file_io.h Sun Mar  7 15:24:36 2010
@@ -80,6 +80,9 @@
 #define APR_FOPEN_SPARSE      0x08000 /**< Platform dependent flag to enable
                                        * sparse file support, see WARNING below
                                        */
+#define APR_FOPEN_NONBLOCK    0x40000 /**< Platform dependent flag to enable
+                                       * non blocking file io */
+
 
 /* backcompat */
 #define APR_READ             APR_FOPEN_READ       /**< @deprecated @see APR_FOPEN_READ
*/



Mime
View raw message