Fixed bug #41770 (SSL: fatal protocol error due to buffer issues).

diff --git a/NEWS b/NEWS
index fc951daea3be76d596901eba809d8456a63e73ba..cdcb2f17cd110f176a03d14a662da2e5181a903c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -60,6 +60,7 @@ PHP                                                                        NEWS
 - Fixed bug #41717 (imagepolygon does not respect thickness). (Pierre)
 - Fixed bug #41711 (NULL temporary lobs not supported in OCI8). 
   (Chris Jones, Tony)
+- Fixed bug #41770 (SSL: fatal protocol error due to buffer issues). (Ilia)
 - Fixed bug #41698 (float parameters truncated to integer in prepared 
   statements). (Ilia)
 - Fixed bug #41692 (ArrayObject shows weird behavior in respect to 

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 674764ce0709ed846d5ba16a91ce6128089f2114..842b9e547dc8e3574c23f7ccd72b0812e91ec354 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -109,7 +109,7 @@ static int handle_ssl_error(php_stream *stream, int nr_bytes, zend_bool is_init
                case SSL_ERROR_SYSCALL:
                        if (ERR_peek_error() == 0) {
                                if (nr_bytes == 0) {
-                                       if (!is_http_stream_talking_to_iis(stream TSRMLS_CC)) {
+                                       if (!is_http_stream_talking_to_iis(stream TSRMLS_CC) && ERR_get_error() != 0) {
                                                php_error_docref(NULL TSRMLS_CC, E_WARNING,
                                                                "SSL: fatal protocol error");
                                        }