From 72d63a715ab3bb85109696154deb9b90d0495852 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Tue, 12 Aug 2014 01:40:11 +0000
Subject: MFC r266728,266731,266735,266736,268135,268960,269833  Update apr
 1.4.8 -> 1.5.1  Update apr-util 1.5.2 -> 1.5.3  Update serf 1.3.4 -> 1.3.7 
 Update svnlite 1.8.8 -> 1.8.10  Deal with svnlite.1 manpage.

---
 contrib/apr/file_io/unix/open.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'contrib/apr/file_io/unix/open.c')

diff --git a/contrib/apr/file_io/unix/open.c b/contrib/apr/file_io/unix/open.c
index 6373ee5..49eb727 100644
--- a/contrib/apr/file_io/unix/open.c
+++ b/contrib/apr/file_io/unix/open.c
@@ -135,6 +135,14 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new,
     }
 #endif
 
+    if (flag & APR_FOPEN_NONBLOCK) {
+#ifdef O_NONBLOCK
+        oflags |= O_NONBLOCK;
+#else
+        return APR_ENOTIMPL;
+#endif
+    }
+
 #ifdef O_CLOEXEC
     /* Introduced in Linux 2.6.23. Silently ignored on earlier Linux kernels.
      */
-- 
cgit v1.1