diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 9 | ||||
| -rw-r--r-- | main/php_globals.h | 1 | ||||
| -rw-r--r-- | main/php_ini.c | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/main/main.c b/main/main.c index 831d3431f2..2f2d0d6508 100644 --- a/main/main.c +++ b/main/main.c @@ -599,8 +599,6 @@ static void php_message_handler_for_zend(long message, void *data) 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 @@ void php_request_shutdown(void *dummy) 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 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_ } if (setjmp(EG(bailout))!=0) { - PG(unclean_shutdown) = 1; return; } _php3_hash_environment(PLS_C ELS_CC); @@ -1178,8 +1175,6 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_ 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 @@ PHPAPI int apache_php3_module_main(request_rec *r, int fd, int display_source_mo 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 */ diff --git a/main/php_globals.h b/main/php_globals.h index 0eae5e131c..ea2597e6a6 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -64,7 +64,6 @@ struct _php_core_globals { long y2k_compliance; unsigned char header_is_being_sent; - unsigned char unclean_shutdown; }; diff --git a/main/php_ini.c b/main/php_ini.c index 56f48f1c66..b96188d525 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -338,7 +338,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module) 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"); } |