cataphract Fri, 12 Nov 2010 18:37:02 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=305298
Log: - Fixed bug #53297 (gettimeofday implementation in php/win32/time.c can return 1 million microsecs). (ped at 7gods dot org) - Moved line out of order in NEWS. Bug: http://bugs.php.net/53297 (error getting bug information) Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/win32/time.c U php/php-src/trunk/win32/time.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-11-12 15:28:49 UTC (rev 305297) +++ php/php-src/branches/PHP_5_3/NEWS 2010-11-12 18:37:02 UTC (rev 305298) @@ -60,7 +60,8 @@ - Fixed the filter extension accepting IPv4 octets with a leading 0 as that belongs to the unsupported "dotted octal" representation. (Gustavo) -- Fixed bug #52693 (configuration file errors are not logged to stderr). (fat) +- Fixed bug #53297 (gettimeofday implementation in php/win32/time.c can return + 1 million microsecs). (ped at 7gods dot org) - Fixed bug #53279 (SplFileObject doesn't initialise default CSV escape character). (Adam) - Fixed bug #53273 (mb_strcut() returns garbage with the excessive length @@ -130,6 +131,7 @@ CASE-WHEN). (Andrey) - Fixed bug #52699 (PDO bindValue writes long int 32bit enum). (rein at basefarm dot no) +- Fixed bug #52693 (configuration file errors are not logged to stderr). (fat) - Fixed bug #52686 (mysql_stmt_attr_[gs]et argument points to incorrect type). (rein at basefarm dot no) - Fixed bug #52681 (mb_send_mail() appends an extra MIME-Version header). Modified: php/php-src/branches/PHP_5_3/win32/time.c =================================================================== --- php/php-src/branches/PHP_5_3/win32/time.c 2010-11-12 15:28:49 UTC (rev 305297) +++ php/php-src/branches/PHP_5_3/win32/time.c 2010-11-12 18:37:02 UTC (rev 305298) @@ -105,7 +105,7 @@ dt = (double)timer/PW32G(freq); time_Info->tv_sec = PW32G(starttime).tv_sec + (int)dt; time_Info->tv_usec = PW32G(starttime).tv_usec + (int)((dt-(int)dt)*1000000); - if (time_Info->tv_usec > 1000000) { + if (time_Info->tv_usec >= 1000000) { time_Info->tv_usec -= 1000000; ++time_Info->tv_sec; } Modified: php/php-src/trunk/win32/time.c =================================================================== --- php/php-src/trunk/win32/time.c 2010-11-12 15:28:49 UTC (rev 305297) +++ php/php-src/trunk/win32/time.c 2010-11-12 18:37:02 UTC (rev 305298) @@ -105,7 +105,7 @@ dt = (double)timer/PW32G(freq); time_Info->tv_sec = PW32G(starttime).tv_sec + (int)dt; time_Info->tv_usec = PW32G(starttime).tv_usec + (int)((dt-(int)dt)*1000000); - if (time_Info->tv_usec > 1000000) { + if (time_Info->tv_usec >= 1000000) { time_Info->tv_usec -= 1000000; ++time_Info->tv_sec; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
