From dd23eb0c88cc1185aff43b09b1166fc6162c19dc Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Tue, 17 Jul 2007 13:28:44 +0000 Subject: [PATCH] MFH:- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work) --- NEWS | 2 ++ main/streams/xp_socket.c | 12 +----------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/NEWS b/NEWS index 72922d7694..093db16504 100644 --- a/NEWS +++ b/NEWS @@ -154,6 +154,8 @@ PHP NEWS apache child die). (isk at ecommerce dot com, Gopal, Tony) - Fixed bug #39291 (ldap_sasl_bind() misses the sasl_authc_id parameter). (diafour at gmail dot com, Jani) +- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work). + (Jani) - Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present). (Jani) diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 57b231be1d..e502489e3a 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -281,18 +281,11 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void } case PHP_STREAM_OPTION_BLOCKING: - oldmode = sock->is_blocked; - - /* no need to change anything */ - if (value == oldmode) - return oldmode; - if (SUCCESS == php_set_sock_blocking(sock->socket, value TSRMLS_CC)) { sock->is_blocked = value; return oldmode; } - return PHP_STREAM_OPTION_RETURN_ERR; case PHP_STREAM_OPTION_READ_TIMEOUT: @@ -751,11 +744,8 @@ static int php_tcp_sockop_set_option(php_stream *stream, int option, int value, /* fall through */ ; } - - /* fall through */ - default: - return php_sockop_set_option(stream, option, value, ptrparam TSRMLS_CC); } + return php_sockop_set_option(stream, option, value, ptrparam TSRMLS_CC); } -- 2.50.1