diff options
| author | Jani Taskinen <jani@php.net> | 2007-07-17 13:28:44 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-07-17 13:28:44 +0000 |
| commit | dd23eb0c88cc1185aff43b09b1166fc6162c19dc (patch) | |
| tree | e37b91dbf6e506afaae257398f2a6c44525bd817 /main/streams/xp_socket.c | |
| parent | addd47150160109c09096d62e15101c73099f422 (diff) | |
| download | php-git-dd23eb0c88cc1185aff43b09b1166fc6162c19dc.tar.gz | |
MFH:- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work)
Diffstat (limited to 'main/streams/xp_socket.c')
| -rw-r--r-- | main/streams/xp_socket.c | 12 |
1 files changed, 1 insertions, 11 deletions
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); } |