iliaa Thu Sep 11 23:56:58 2008 UTC Modified files: /php-src/ext/openssl xp_ssl.c Log: MFB: 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.38&r2=1.39&diff_format=u Index: php-src/ext/openssl/xp_ssl.c diff -u php-src/ext/openssl/xp_ssl.c:1.38 php-src/ext/openssl/xp_ssl.c:1.39 --- php-src/ext/openssl/xp_ssl.c:1.38 Fri Jul 11 10:24:29 2008 +++ php-src/ext/openssl/xp_ssl.c Thu Sep 11 23:56:57 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_ssl.c,v 1.38 2008/07/11 10:24:29 tony2001 Exp $ */ +/* $Id: xp_ssl.c,v 1.39 2008/09/11 23:56:57 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;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php