com php-src: Revert "Bug #41631: Fix regression from first attempt (6569db8)": ext/openssl/xp_ssl.c
| From: | Ferenc Kovacs | Date: | Wed, 15 Oct 2014 17:32:14 +0000 |
| Subject: | com php-src: Revert "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-82353@lists.php.net to get a copy of this message | ||
Commit: ff91a48f6ea074ff53a37069b3454840bd08c946
Author: Ferenc Kovacs <tyrael@php.net> Wed, 15 Oct 2014 19:32:14 +0200
Parents: 836a5dfddbe36e6171f29c0548af1c06c7fce6b1
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ff91a48f6ea074ff53a37069b3454840bd08c946
Log:
Revert "Bug #41631: Fix regression from first attempt (6569db8)"
This reverts commit 372844918a318ad712e16f9ec636682424a65403.
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 2f81dc7..feaf09d 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -1852,7 +1852,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 && SSL_pending(sslsock->ssl_handle) == 0) {
+ if (sock->is_blocked) {
php_openssl_stream_wait_for_data(sock);
if (sock->timeout_event) {
stream->eof = 1;