com php-src: Bug #41631: Fix regression from first attempt (6569db8): ext/openssl/xp_ssl.c

From: Date: Tue, 09 Sep 2014 15:01:42 +0000
Subject: com php-src: Bug #41631: Fix regression from first attempt (6569db8): ext/openssl/xp_ssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81477@lists.php.net to get a copy of this message
Commit: 372844918a318ad712e16f9ec636682424a65403 Author: Daniel Lowrey <rdlowrey@php.net> Tue, 9 Sep 2014 07:50:15 -0600 Parents: f86b2193a483f56b0bd056570a0cdb57ebe66e2f Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=372844918a318ad712e16f9ec636682424a65403 Log: Bug #41631: Fix regression from first attempt (6569db8) Bugs: https://bugs.php.net/41631 Changed paths: M ext/openssl/xp_ssl.c Diff: diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 76095b4..b2a939d 100644 --- a/ext/openssl/xp_ssl.c +++ b/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;

« previous php.cvs (#81477) next »