iliaa Thu Sep 11 23:56:44 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/openssl xp_ssl.c /php-src NEWS Log: Fixed bug #45382 (timeout bug in stream_socket_enable_crypto). http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.9.2.6&r2=1.22.2.3.2.9.2.7&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.9.2.6 php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.7 --- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.6 Fri Jul 11 10:25:15 2008 +++ php-src/ext/openssl/xp_ssl.c Thu Sep 11 23:56:43 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.6 2008/07/11 10:25:15 tony2001 Exp $ */ +/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.7 2008/09/11 23:56:43 iliaa Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -417,7 +417,7 @@ n = SSL_connect(sslsock->ssl_handle); gettimeofday(&tve, &tz); - timeout -= (tve.tv_sec + tve.tv_usec / 1000000) - (tvs.tv_sec + tvs.tv_usec / 1000000); + timeout -= (tve.tv_sec + (float) tve.tv_usec / 1000000) - (tvs.tv_sec + (float) tvs.tv_usec / 1000000); if (timeout < 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSL: connection timeout"); return -1; http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.314&r2=1.2027.2.547.2.965.2.315&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.314 php-src/NEWS:1.2027.2.547.2.965.2.315 --- php-src/NEWS:1.2027.2.547.2.965.2.314 Thu Sep 11 03:29:54 2008 +++ php-src/NEWS Thu Sep 11 23:56:43 2008 @@ -5,9 +5,13 @@ - Changed error level E_ERROR into E_WARNING in Soap extension methods parameter validation. (Felipe) +- Fixed bug #46042 (memory leaks with reflection of mb_convert_encoding()). + (Ilia) - Fixed bug #45928 (large scripts from stdin are stripped at 16K border). (Christian Schneider, Arnaud) - Fixed bug #45911 (Cannot disable ext/hash). (Arnaud) +- Fixed bug #45382 (timeout bug in stream_socket_enable_crypto). + (vnegrier at optilian dot com, Ilia 02 Sep 2008, PHP 5.3.0 Alpha 2 - Removed special treatment of "/tmp" in sessions for open_basedir.
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php