[PHP4BETA] CVS update: php4

Date: Tuesday May 11, 1999 @ 12:52 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv11280 Modified Files: main.c php_globals.h php_ini.c Log Message: * Move unclean_shutdown from PHP to Zend. * The Master/Local headers in the phpinfo() table were reversed. * Fix a gpc bug Index: php4/main.c diff -u php4/main.c:1.54 php4/main.c:1.55 --- php4/main.c:1.54 Mon May 10 20:43:46 1999 +++ php4/main.c Tue May 11 12:52:57 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.54 1999/05/11 00:43:46 zeev Exp $ */ +/* $Id: main.c,v 1.55 1999/05/11 16:52:57 zeev Exp $ */ #include <stdio.h> @@ -599,8 +599,6 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) { - PG(unclean_shutdown) = 0; - zend_output_startup(); #if APACHE @@ -675,7 +673,7 @@ sapi_deactivate(SLS_C); php3_destroy_request_info(NULL); - shutdown_memory_manager(PG(unclean_shutdown), 0); + shutdown_memory_manager(CG(unclean_shutdown), 0); php3_unset_timeout(); @@ -1151,7 +1149,6 @@ } if (setjmp(EG(bailout))!=0) { - PG(unclean_shutdown) = 1; return; } _php3_hash_environment(PLS_C ELS_CC); @@ -1178,8 +1175,6 @@ if (EG(main_op_array)) { EG(active_op_array) = EG(main_op_array); zend_execute(EG(main_op_array) ELS_CC); - } else { - PG(unclean_shutdown) = 1; } } @@ -1207,7 +1202,7 @@ php3_TreatHeaders(); file_handle.type = ZEND_HANDLE_FD; file_handle.handle.fd = fd; - file_handle.filename = request_info.filename; + file_handle.filename = SG(request_info).path_translated; (void) php_execute_script(&file_handle CLS_CC ELS_CC); php3_header(); /* Make sure headers have been sent */ Index: php4/php_globals.h diff -u php4/php_globals.h:1.12 php4/php_globals.h:1.13 --- php4/php_globals.h:1.12 Mon May 10 15:48:23 1999 +++ php4/php_globals.h Tue May 11 12:52:57 1999 @@ -64,7 +64,6 @@ long y2k_compliance; unsigned char header_is_being_sent; - unsigned char unclean_shutdown; }; Index: php4/php_ini.c diff -u php4/php_ini.c:1.16 php4/php_ini.c:1.17 --- php4/php_ini.c:1.16 Mon May 10 20:43:46 1999 +++ php4/php_ini.c Tue May 11 12:52:57 1999 @@ -338,7 +338,7 @@ module_number = 0; } PUTS("<table border=5 width=\"600\">\n"); - php_info_print_table_header(3, "Directive", "Master Value", "Local Value"); + php_info_print_table_header(3, "Directive", "Local Value", "Master Value"); zend_hash_apply_with_argument(&known_directives, (int (*)(void *, void *)) php_ini_displayer, (void *) module_number); PUTS("</table>\n"); } -- PHP 4 Beta