From: Andi Gutmans Date: Sun, 21 May 2000 17:41:16 +0000 (+0000) Subject: - Fix Apache php source highlighting mode. It was crashing due to the X-Git-Tag: php-4.0.0~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8b0d9609c6e8a73da474ecf12dc5723f535c597;p=php - Fix Apache php source highlighting mode. It was crashing due to the - module shutdown functions being called when the startup functions weren't - being called. --- diff --git a/Zend/zend.c b/Zend/zend.c index c2a1e5e261..961f0fc25e 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -460,12 +460,17 @@ void zend_activate_modules() zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_request_startup); } +void zend_deactivate_modules() +{ + EG(opline_ptr) = NULL; /* we're no longer executing anything */ + + zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_cleanup); +} void zend_deactivate(CLS_D ELS_DC) { EG(opline_ptr) = NULL; /* we're no longer executing anything */ - zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_cleanup); shutdown_scanner(CLS_C); shutdown_executor(ELS_C); shutdown_compiler(CLS_C); diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 997c6519bf..d3eb8dde58 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -211,6 +211,7 @@ extern ZEND_API zend_op_array *(*zend_v_compile_files)(int type CLS_DC, int file void zend_activate(CLS_D ELS_DC); void zend_deactivate(CLS_D ELS_DC); void zend_activate_modules(void); +void zend_deactivate_modules(void); int lex_scan(zval *zendlval CLS_DC);