summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/main.c2
-rw-r--r--main/php_ticks.c5
-rw-r--r--main/php_ticks.h1
3 files changed, 8 insertions, 0 deletions
diff --git a/main/main.c b/main/main.c
index 1f656eda57..2e083712a5 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1472,6 +1472,8 @@ void php_request_shutdown(void *dummy)
EG(opline_ptr) = NULL;
EG(active_op_array) = NULL;
+ php_deactivate_ticks(TSRMLS_C);
+
/* 1. Call all possible shutdown functions registered with register_shutdown_function() */
if (PG(modules_activated)) zend_try {
php_call_shutdown_functions(TSRMLS_C);
diff --git a/main/php_ticks.c b/main/php_ticks.c
index c9fa5e4e9b..ffc1dabf59 100644
--- a/main/php_ticks.c
+++ b/main/php_ticks.c
@@ -27,6 +27,11 @@ int php_startup_ticks(TSRMLS_D)
return SUCCESS;
}
+void php_deactivate_ticks(TSRMLS_D)
+{
+ zend_llist_clean(&PG(tick_functions));
+}
+
void php_shutdown_ticks(TSRMLS_D)
{
zend_llist_destroy(&PG(tick_functions));
diff --git a/main/php_ticks.h b/main/php_ticks.h
index d3d0ae1509..9dc930746f 100644
--- a/main/php_ticks.h
+++ b/main/php_ticks.h
@@ -22,6 +22,7 @@
#define PHP_TICKS_H
int php_startup_ticks(TSRMLS_D);
+void php_deactivate_ticks(TSRMLS_D);
void php_shutdown_ticks(TSRMLS_D);
void php_run_ticks(int count);