diff options
| author | peter <peter@FreeBSD.org> | 2014-05-27 07:15:14 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-05-27 07:15:14 +0000 |
| commit | 073d039ce1755179ade6d76571f16045ade34213 (patch) | |
| tree | 0e023fb89b7a7e9a4fa11cfb7d9118a7510d2640 /contrib/apr/file_io/unix/open.c | |
| parent | c5be37fb1f34d0c40f8f70140824b785f414c4da (diff) | |
| parent | ca02a2bfd2f08739388e00fb3bbe93fa3fa5efb0 (diff) | |
| download | FreeBSD-src-073d039ce1755179ade6d76571f16045ade34213.zip FreeBSD-src-073d039ce1755179ade6d76571f16045ade34213.tar.gz | |
Merge apr-1.4.8 -> apr-1.5.1 and update.
Diffstat (limited to 'contrib/apr/file_io/unix/open.c')
| -rw-r--r-- | contrib/apr/file_io/unix/open.c | 8 |
1 files changed, 8 insertions, 0 deletions
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. */ |
