php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 11:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

MFH:- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work)

Browse Source
This commit is contained in:
Jani Taskinen
2007-07-17 13:28:44 +00:00
parent addd471501
commit dd23eb0c88
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -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)

12
main/streams/xp_socket.c
View File

@@ -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);
}