Browse Source

Bug #41631: Fix regression from first attempt (6569db8)

pull/827/head
Daniel Lowrey 11 years ago
parent
commit
372844918a
  1. 2
      ext/openssl/xp_ssl.c

2
ext/openssl/xp_ssl.c

@ -249,7 +249,7 @@ static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t coun
to hang forever. To avoid this scenario we poll with a timeout before performing
the actual read. If it times out we're finished.
*/
if (sock->is_blocked) {
if (sock->is_blocked && SSL_pending(sslsock->ssl_handle) == 0) {
php_openssl_stream_wait_for_data(sock);
if (sock->timeout_event) {
stream->eof = 1;

Loading…
Cancel
Save