Skip to content
Permalink
Browse files

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

  • Loading branch information...
rdlowrey committed Sep 9, 2014
1 parent f86b219 commit 372844918a318ad712e16f9ec636682424a65403
Showing with 1 addition and 1 deletion.
  1. +1 −1 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;

0 comments on commit 3728449

Please sign in to comment.
You can’t perform that action at this time.