Fixed bug #37558 (timeout functionality doesn't work after a second PHP starup on...

diff --git a/NEWS b/NEWS
index f5a1d662b027b95338de9bf60bdd550c909c6fd3..64713291f20de9ec53243a0f8f4d9d585b23f528 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,8 @@ PHP                                                                        NEWS
 - Fixed bug #37565 (Using reflection::export with simplexml causing a crash).
   (Marcus)
 - Fixed bug #37563 (array_key_exists performance is poor for &$array). (Ilia)
+- Fixed bug #37558 (timeout functionality doesn't work after a second PHP
+  starup on the same thread). (p dot desarnaud at wanadoo dot fr)
 - Fixed bug #37514 (strtotime doesn't assume year correctly). (Derick)
 - Fixed bug #37510 (session_regenerate_id changes session_id() even on 
   failure). (Hannes)

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 2d0f35eebff161822b893639b7b5ac30cddad538..7b9f1417754677bb42ba71cffba3c3acde370e08 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1332,6 +1332,7 @@ void zend_shutdown_timeout_thread()
        /* Wait for thread termination */
        WaitForSingleObject(timeout_thread_handle, 5000);
        CloseHandle(timeout_thread_handle);
+       timeout_thread_initialized = 0;
 }
 
 #endif