iliaa Mon Jul 2 16:42:10 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/openssl xp_ssl.c
Log:
Fixed bug #41770 (SSL: fatal protocol error due to buffer issues).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.811&r2=1.2027.2.547.2.812&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.811 php-src/NEWS:1.2027.2.547.2.812
--- php-src/NEWS:1.2027.2.547.2.811 Mon Jul 2 15:54:08 2007
+++ php-src/NEWS Mon Jul 2 16:42:09 2007
@@ -60,6 +60,7 @@
- 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
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.8&r2=1.22.2.3.2.9&diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.8
php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9
--- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.8 Sun May 27 17:05:51 2007
+++ php-src/ext/openssl/xp_ssl.c Mon Jul 2 16:42:10 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_ssl.c,v 1.22.2.3.2.8 2007/05/27 17:05:51 iliaa Exp $ */
+/* $Id: xp_ssl.c,v 1.22.2.3.2.9 2007/07/02 16:42:10 iliaa Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -109,7 +109,7 @@
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");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
