archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #45352 (Segmentation fault because of tick function on second request)

Browse source
This commit is contained in:
Dmitry Stogov 2008-06-25 12:18:36 +00:00
parent c5ec48e858
commit 531b31ca08
3 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main/main.c
View file

@ -1472,6 +1472,8 @@ void php_request_shutdown(void *dummy)
EG(opline_ptr) = NULL; EG(opline_ptr) = NULL;
EG(active_op_array) = NULL; EG(active_op_array) = NULL;
php_deactivate_ticks(TSRMLS_C);
/* 1. Call all possible shutdown functions registered with register_shutdown_function() */ /* 1. Call all possible shutdown functions registered with register_shutdown_function() */
if (PG(modules_activated)) zend_try { if (PG(modules_activated)) zend_try {
php_call_shutdown_functions(TSRMLS_C); php_call_shutdown_functions(TSRMLS_C);

5
main/php_ticks.c
View file

@ -27,6 +27,11 @@ int php_startup_ticks(TSRMLS_D)
return SUCCESS; return SUCCESS;
} }
void php_deactivate_ticks(TSRMLS_D)
{
zend_llist_clean(&PG(tick_functions));
}
void php_shutdown_ticks(TSRMLS_D) void php_shutdown_ticks(TSRMLS_D)
{ {
zend_llist_destroy(&PG(tick_functions)); zend_llist_destroy(&PG(tick_functions));

1
main/php_ticks.h
View file

@ -22,6 +22,7 @@
#define PHP_TICKS_H #define PHP_TICKS_H
int php_startup_ticks(TSRMLS_D); int php_startup_ticks(TSRMLS_D);
void php_deactivate_ticks(TSRMLS_D);
void php_shutdown_ticks(TSRMLS_D); void php_shutdown_ticks(TSRMLS_D);
void php_run_ticks(int count); void php_run_ticks(int count);