diff options
| author | Antony Dovgal <tony2001@php.net> | 2005-11-17 14:19:40 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2005-11-17 14:19:40 +0000 |
| commit | 1a78dc5fbf54732e9edb27a79dc1116d971adf7f (patch) | |
| tree | ee695875cca81e196dd0cd0ecb205b5c6cf8ae32 | |
| parent | 924ae32ddfef04c20bde0a5cc066a3e378f5dcf6 (diff) | |
| download | php-git-1a78dc5fbf54732e9edb27a79dc1116d971adf7f.tar.gz | |
MFH: fix #35079 (stream_set_blocking(true) toggles, not enables blocking)
patch by askalski at gmail dot com
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/streams/plain_wrapper.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -19,6 +19,8 @@ PHP NEWS - Fixed bug #35142 (SOAP Client/Server Complex Object Support). (Dmitry) - Fixed bug #35135 (PDOStatment without related PDO object may crash). (Ilia) - Fixed bug #35091 (SoapClient leaks memory). (Dmitry) +- Fixed bug #35079 (stream_set_blocking(true) toggles, not enables + blocking). (askalski at gmail dot com, Tony) - Fixed bug #35078 (configure does not find ldap_start_tls_s). (Jani) - Fixed bugs #35022, #35019 (Regression in the behavior of key() and current() functions). (Ilia) diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 6acb5edc86..83e0e74165 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -540,7 +540,7 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void flags = fcntl(fd, F_GETFL, 0); oldval = (flags & O_NONBLOCK) ? 0 : 1; if (value) - flags ^= O_NONBLOCK; + flags &= ~O_NONBLOCK; else flags |= O_NONBLOCK; |