cvs: php-src /main/streams xp_socket.c

jani Tue Jul 17 13:27:39 2007 UTC Modified files: /php-src/main/streams xp_socket.c Log: - Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work) http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.40&r2=1.41&diff_format=u Index: php-src/main/streams/xp_socket.c diff -u php-src/main/streams/xp_socket.c:1.40 php-src/main/streams/xp_socket.c:1.41 --- php-src/main/streams/xp_socket.c:1.40 Mon Jan 1 09:29:36 2007 +++ php-src/main/streams/xp_socket.c Tue Jul 17 13:27:38 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_socket.c,v 1.40 2007/01/01 09:29:36 sebastian Exp $ */ +/* $Id: xp_socket.c,v 1.41 2007/07/17 13:27:38 jani Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -281,18 +281,11 @@ } 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 @@ /* 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); }