- 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.
This commit is contained in:
Gustavo André dos Santos Lopes 2010-11-12 18:37:02 +00:00
parent b343748d56
commit 3332c5be08
2 changed files with 4 additions and 2 deletions

4
NEWS
View File

@ -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).

View File

@ -105,7 +105,7 @@ PHPAPI int gettimeofday(struct timeval *time_Info, struct timezone *timezone_Inf
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;
}