cvs: Zend(PHP_4_3) / zend_execute_API.c
| From: | Zeev Suraski | Date: | Mon, 19 Jan 2004 09:58:10 +0000 |
| Subject: | cvs: Zend(PHP_4_3) / zend_execute_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2237@lists.php.net to get a copy of this message | ||
zeev Mon Jan 19 04:58:10 2004 EDT
Modified files: (Branch: PHP_4_3)
/Zend zend_execute_API.c
Log:
Backport fix for bug #21513
Index: Zend/zend_execute_API.c
diff -u Zend/zend_execute_API.c:1.155.2.6 Zend/zend_execute_API.c:1.155.2.7
--- Zend/zend_execute_API.c:1.155.2.6 Mon Aug 4 13:14:16 2003
+++ Zend/zend_execute_API.c Mon Jan 19 04:58:10 2004
@@ -746,7 +746,15 @@
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: