Make max_execution_time work properly when set to 0 under Win32 (disable)

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 4d311581e7f239c64e5c3d7a7d25c56358cc9918..b646aa0184409488b43af16103114bd7d612d53e 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -573,7 +573,11 @@ static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wPa
                        break;
                case WM_REGISTER_ZEND_TIMEOUT:
                        /* wParam is the thread id pointer, lParam is the timeout amount in seconds */
-                       SetTimer(timeout_window, wParam, lParam*1000, NULL);
+                       if (lParam==0) {
+                               KillTimer(timeout_window, wParam);
+                       } else {
+                               SetTimer(timeout_window, wParam, lParam*1000, NULL);
+                       }
                        break;
                case WM_UNREGISTER_ZEND_TIMEOUT:
                        /* wParam is the thread id pointer */