Browse Source

Revert fix for 43782, as it caused problems.

[DOC] We better document the issue at it is.
experimental/first_unicode_implementation
David Soria Parra 18 years ago
parent
commit
e61a107e8b
  1. 2
      main/streams/streams.c
  2. 8
      main/streams/xp_socket.c

2
main/streams/streams.c

@ -840,7 +840,7 @@ PHPAPI int _php_stream_eof(php_stream *stream TSRMLS_DC)
/* use the configured timeout when checking eof */
if (!stream->eof && PHP_STREAM_OPTION_RETURN_ERR ==
php_stream_set_option(stream, PHP_STREAM_OPTION_CHECK_LIVENESS,
-1, NULL)) {
0, NULL)) {
stream->eof = 1;
}

8
main/streams/xp_socket.c

@ -280,12 +280,8 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void
if (sock->socket == -1) {
alive = 0;
} else {
if (php_pollfd_for(sock->socket, PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
if (0 == recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
alive = 0;
}
} else {
} else if (php_pollfd_for(sock->socket, PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
if (0 == recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
alive = 0;
}
}

Loading…
Cancel
Save