Fixed Bug #39396 (stream_set_blocking crashes on Win32).

diff --git a/NEWS b/NEWS
index da3f2b68b454b6ba8a268a612ea52ebf4af84ed0..1a0c519b690cccedcc5ed8bd49562e96e86430f2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,8 @@ PHP                                                                        NEWS
 - Fixed bug #40236 (php -a function allocation eats memory). (Dmitry)
 - Fixed bug #40109 (iptcembed fails on non-jfif jpegs). (Tony)
 - Fixed bug #39836 (SplObjectStorage empty after unserialize). (Marcus)
+- Fixed Bug #39396 (stream_set_blocking crashes on Win32). (Ilia, maurice at
+  iceblog dot de)
 - Fixed bug #39322 (proc_terminate() destroys process resource). (Nuno)
 - Fixed bug #38406 (crash when assigning objects to SimpleXML attributes). (Tony)
 - Fixed bug #37799 (ftp_ssl_connect() falls back to non-ssl connection). (Nuno)

diff --git a/main/streams/transports.c b/main/streams/transports.c
index 54d0d9a9dacfdbe44c4374790efc4b9c9e90ec23..07d0c795e302c0f1bb435ff8523de251bcf21cf9 100644 (file)
--- a/main/streams/transports.c
+++ b/main/streams/transports.c
@@ -139,7 +139,7 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, long namelen, int
                if ((flags & STREAM_XPORT_SERVER) == 0) {
                        /* client */
 
-                       if (flags & STREAM_XPORT_CONNECT) {
+                       if (flags & (STREAM_XPORT_CONNECT|STREAM_XPORT_CONNECT_ASYNC)) {
                                if (-1 == php_stream_xport_connect(stream, name, namelen,
                                                        flags & STREAM_XPORT_CONNECT_ASYNC ? 1 : 0,
                                                        timeout, &error_text, error_code TSRMLS_CC)) {