From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 2 Jul 2007 16:42:10 +0000 (+0000)
Subject: Fixed bug #41770 (SSL: fatal protocol error due to buffer issues).
X-Git-Tag: php-5.2.4RC1~245
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=921294e0d79078f791894aa31b56306715b2d61f;p=php

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

diff --git a/NEWS b/NEWS
index fc951daea3..cdcb2f17cd 100644
--- 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 674764ce07..842b9e547d 100644
--- 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");
 					}