diff options
| author | Anatol Belski <ab@php.net> | 2017-01-07 12:36:09 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-01-07 12:36:09 +0100 |
| commit | bba09d56e597db1dc136c798fec3392aec71518e (patch) | |
| tree | c55637be990fe0721d3639ed0b044c5eadeedd83 /main/streams/plain_wrapper.c | |
| parent | 5ae45ef99374b02a676faaad5384ec8c0784d185 (diff) | |
| parent | d0279242ce0e6512db0af8dde2a6b11498898ef4 (diff) | |
| download | php-git-bba09d56e597db1dc136c798fec3392aec71518e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
add 'e' flag for fopen() to enable CLOEXEC
Diffstat (limited to 'main/streams/plain_wrapper.c')
| -rw-r--r-- | main/streams/plain_wrapper.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 80fe3ff5a9..6bc0138f29 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -96,6 +96,12 @@ PHPAPI int php_stream_parse_fopen_modes(const char *mode, int *open_flags) flags |= O_RDONLY; } +#if defined(O_CLOEXEC) + if (strchr(mode, 'e')) { + flags |= O_CLOEXEC; + } +#endif + #if defined(O_NONBLOCK) if (strchr(mode, 'n')) { flags |= O_NONBLOCK; |