Fixed bug #65268 select() implementation uses outdated tick API

weltling · weltling · commit 99afc6dc1101 · 2013-07-18T18:01:51.000+02:00
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2013, PHP 5.5.2
 
+- Streams:
+  . Fixed bug #65268 (select() implementation uses outdated tick API). (Anatol)
+
 18 Jul 2013, PHP 5.5.1
 
 - Core:
diff --git a/win32/select.c b/win32/select.c
@@ -36,7 +36,7 @@
  * */
 PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv)
 {
-	DWORD ms_total, limit;
+	ULONGLONG ms_total, limit;
 	HANDLE handles[MAXIMUM_WAIT_OBJECTS];
 	int handle_slot_to_fd[MAXIMUM_WAIT_OBJECTS];
 	int n_handles = 0, i;
@@ -97,7 +97,7 @@ PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, stru
 	FD_ZERO(&awrite);
 	FD_ZERO(&aexcept);
 	
-	limit = GetTickCount() + ms_total;
+	limit = GetTickCount64() + ms_total;
 	do {
 		retcode = 0;
 	
@@ -149,7 +149,7 @@ PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, stru
 				}
 			}
 		}
-	} while (retcode == 0 && (ms_total == INFINITE || GetTickCount() < limit));
+	} while (retcode == 0 && (ms_total == INFINITE || GetTickCount64() < limit));
 
 	if (rfds) {
 		*rfds = aread;

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`* */`
`37`	`37`	`PHPAPI int php_select(int max_fd, fd_set rfds, fd_set wfds, fd_set efds, struct timeval tv)`
`38`	`38`	`{`
`39`		`- DWORD ms_total, limit;`
	`39`	`+ ULONGLONG ms_total, limit;`
`40`	`40`	`HANDLE handles[MAXIMUM_WAIT_OBJECTS];`
`41`	`41`	`int handle_slot_to_fd[MAXIMUM_WAIT_OBJECTS];`
`42`	`42`	`int n_handles = 0, i;`
`@@ -97,7 +97,7 @@ PHPAPI int php_select(int max_fd, fd_set rfds, fd_set wfds, fd_set *efds, stru`
`97`	`97`	`FD_ZERO(&awrite);`
`98`	`98`	`FD_ZERO(&aexcept);`
`99`	`99`
`100`		`- limit = GetTickCount() + ms_total;`
	`100`	`+ limit = GetTickCount64() + ms_total;`
`101`	`101`	`do {`
`102`	`102`	`retcode = 0;`
`103`	`103`
`@@ -149,7 +149,7 @@ PHPAPI int php_select(int max_fd, fd_set rfds, fd_set wfds, fd_set *efds, stru`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`}`
`152`		`- } while (retcode == 0 && (ms_total == INFINITE \|\| GetTickCount() < limit));`
	`152`	`+ } while (retcode == 0 && (ms_total == INFINITE \|\| GetTickCount64() < limit));`
`153`	`153`
`154`	`154`	`if (rfds) {`
`155`	`155`	`*rfds = aread;`