Forward-port fix for timeouts under Windows

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 3d2c4ccd28f94de203dc5033b57741aa939a304c..6cf4a2ebcbdff750d72c85371ee4188a52bca2c8 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1007,7 +1007,15 @@ static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wPa
                        if (lParam==0) {
                                KillTimer(timeout_window, wParam);
                        } else {
+                               void ***tsrm_ls;
+
                                SetTimer(timeout_window, wParam, lParam*1000, NULL);
+                               tsrm_ls = ts_resource_ex(0, &wParam);
+                               if (!tsrm_ls) {
+                                       /* shouldn't normally happen */
+                                       break;
+                               }
+                               EG(timed_out) = 0;
                        }
                        break;
                case WM_UNREGISTER_ZEND_TIMEOUT: