cvs: ZendEngine2(PHP_5_3) / zend_execute_API.c
[email protected] ("Rasmus Lerdorf")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsrasmus1205940649@cvsserver> |
rasmus Wed Mar 19 15:30:49 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_execute_API.c
Log:
On Windows I guess there is no point starting the timeout thread until
we actually have a timeout value.
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.32&r2=1.331.2.20.2.24.2.33&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.32 ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.33
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.32 Wed Mar 19 15:22:17 2008
+++ ZendEngine2/zend_execute_API.c Wed Mar 19 15:30:49 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.32 2008/03/19 15:22:17 rasmus Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.33 2008/03/19 15:30:49 rasmus Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -1534,13 +1534,16 @@
EG(timeout_seconds) = seconds;
#ifdef ZEND_WIN32
+ if(!seconds) {
+ return;
+ }
if (timeout_thread_initialized == 0 && InterlockedIncrement(&timeout_thread_initialized) == 1) {
/* We start up this process-wide thread here and not in zend_startup(), because if Zend
* is initialized inside a DllMain(), you're not supposed to start threads from it.
*/
zend_init_timeout_thread();
}
- if(seconds) PostThreadMessage(timeout_thread_id, WM_REGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) seconds);
+ PostThreadMessage(timeout_thread_id, WM_REGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) seconds);
#else
# ifdef HAVE_SETITIMER
{