diff options
| author | Zeev Suraski <zeev@php.net> | 2000-06-26 15:17:36 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-06-26 15:17:36 +0000 |
| commit | 202b8100ab14260d63f83a274d9bd6a7b886b0c7 (patch) | |
| tree | 9a27ee4d059b7661993e8671eb91a1e9b01d7e03 /Zend/zend_execute_API.c | |
| parent | 2c32d120b2daa05b6b7d15eef6670a52f316b657 (diff) | |
| download | php-git-202b8100ab14260d63f83a274d9bd6a7b886b0c7.tar.gz | |
Make max_execution_time work properly when set to 0 under Win32 (disable)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 4d311581e7..b646aa0184 100644 --- 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 */ |