cvs: /php4 main.c php.h php_globals.h /php4/ext/session session.c

zeev Sun Jan 16 11:43:35 2000 EDT Modified files: /php4 main.c php.h php_globals.h /php4/ext/session session.c Log: Remove the post-startup callback support. Modules are now started only after the entire engine is started. People - please make sure that the session module works properly for you. Index: php4/main.c diff -u php4/main.c:1.177 php4/main.c:1.178 --- php4/main.c:1.177 Sun Jan 16 06:34:28 2000 +++ php4/main.c Sun Jan 16 11:43:32 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.177 2000/01/16 14:34:28 thies Exp $ */ +/* $Id: main.c,v 1.178 2000/01/16 19:43:32 zeev Exp $ */ #include <stdio.h> @@ -670,14 +670,6 @@ } } -static void php_execute_post_request_startup(PLS_D) -{ - if (PG(post_request_startup_ok)) { - zend_llist_apply(&PG(ll_post_request_startup), php_start_request_hook); - zend_llist_destroy(&PG(ll_post_request_startup)); - PG(post_request_startup_ok) = 0; - } -} void php_register_pre_request_shutdown(void (*func)(void *), void *userdata) { @@ -695,30 +687,13 @@ zend_llist_add_element(&PG(ll_pre_request_shutdown), &ptr); } -void php_register_post_request_startup(void (*func)(void *), void *userdata) -{ - php_request_hook ptr; - PLS_FETCH(); - - if (!PG(post_request_startup_ok)) { - zend_llist_init(&PG(ll_post_request_startup), sizeof(php_request_hook), NULL, 0); - PG(post_request_startup_ok) = 1; - } - ptr.func = func; - ptr.userdata = userdata; - - zend_llist_add_element(&PG(ll_post_request_startup), &ptr); -} - int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) { global_lock(); php_output_startup(); - PG(post_request_startup_ok) = PG(pre_request_shutdown_ok) = 0; - #if APACHE /* * For the Apache module version, this bit of code registers a cleanup @@ -796,6 +771,7 @@ CLS_FETCH(); ELS_FETCH(); SLS_FETCH(); + PLS_FETCH(); php_execute_pre_request_shutdown(PLS_C); @@ -1298,7 +1274,7 @@ if (EG(main_op_array)) { zend_hash_environment(PLS_C ELS_CC SLS_CC); EG(active_op_array) = EG(main_op_array); - php_execute_post_request_startup(PLS_C); + zend_activate_modules(); zend_execute(EG(main_op_array) ELS_CC); } } Index: php4/php.h diff -u php4/php.h:1.56 php4/php.h:1.57 --- php4/php.h:1.56 Sat Jan 15 05:02:54 2000 +++ php4/php.h Sun Jan 16 11:43:32 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.56 2000/01/15 13:02:54 thies Exp $ */ +/* $Id: php.h,v 1.57 2000/01/16 19:43:32 zeev Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -319,7 +319,6 @@ /*from basic functions*/ extern PHPAPI int _php_error_log(int opt_err,char *message,char *opt,char *headers); -PHPAPI void php_register_post_request_startup(void (*func)(void *), void *userdata); PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userdata); PHPAPI int cfg_get_long(char *varname, long *result); Index: php4/php_globals.h diff -u php4/php_globals.h:1.34 php4/php_globals.h:1.35 --- php4/php_globals.h:1.34 Sat Jan 15 05:30:32 2000 +++ php4/php_globals.h Sun Jan 16 11:43:33 2000 @@ -96,10 +96,8 @@ unsigned char header_is_being_sent; - zend_llist ll_post_request_startup; zend_llist ll_pre_request_shutdown; - zend_bool post_request_startup_ok; zend_bool pre_request_shutdown_ok; }; Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.95 php4/ext/session/session.c:1.96 --- php4/ext/session/session.c:1.95 Sat Jan 15 08:56:30 2000 +++ php4/ext/session/session.c Sun Jan 16 11:43:34 2000 @@ -1177,13 +1177,7 @@ zend_hash_destroy(&PS(vars)); } -void _php_session_auto_start(void *data) -{ - PSLS_FETCH(); - _php_session_start(PSLS_C); -} - void _php_session_shutdown(void *data) { PSLS_FETCH(); @@ -1207,9 +1201,7 @@ return SUCCESS; } - if (INI_INT("session.auto_start")) { - php_register_post_request_startup(_php_session_auto_start, NULL); - } + _php_session_start(PSLS_C); php_register_pre_request_shutdown(_php_session_shutdown, NULL);