cvs: php4 /main main.c /sapi/cgi cgi_main.c /sapi/isapi php4isapi.c /sapi/nsapi nsapi.c /sapi/roxen roxen.c /sapi/thttpd thttpd.c

stas Sun Aug 13 11:00:41 2000 EDT Modified files: /php4/main main.c /php4/sapi/cgi cgi_main.c /php4/sapi/isapi php4isapi.c /php4/sapi/nsapi nsapi.c /php4/sapi/roxen roxen.c /php4/sapi/thttpd thttpd.c Log: Fix zend_fiel_handle handling. Should fix URL include and various opened_path inconsistencies. Index: php4/main/main.c diff -u php4/main/main.c:1.290 php4/main/main.c:1.291 --- php4/main/main.c:1.290 Wed Aug 9 12:23:53 2000 +++ php4/main/main.c Sun Aug 13 11:00:36 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.290 2000/08/09 19:23:53 zeev Exp $ */ +/* $Id: main.c,v 1.291 2000/08/13 18:00:36 stas Exp $ */ #include <stdio.h> @@ -1149,6 +1149,7 @@ if (PG(auto_prepend_file) && PG(auto_prepend_file)[0]) { prepend_file.filename = PG(auto_prepend_file); + prepend_file.opened_path = NULL; prepend_file.free_filename = 0; prepend_file.type = ZEND_HANDLE_FILENAME; prepend_file_p = &prepend_file; @@ -1157,6 +1158,7 @@ } if (PG(auto_append_file) && PG(auto_append_file)[0]) { append_file.filename = PG(auto_append_file); + append_file.opened_path = NULL; append_file.free_filename = 0; append_file.type = ZEND_HANDLE_FILENAME; append_file_p = &append_file; Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.66 php4/sapi/cgi/cgi_main.c:1.67 --- php4/sapi/cgi/cgi_main.c:1.66 Sat Aug 5 04:28:32 2000 +++ php4/sapi/cgi/cgi_main.c Sun Aug 13 11:00:37 2000 @@ -641,6 +641,7 @@ file_handle.filename = "-"; file_handle.type = ZEND_HANDLE_FP; file_handle.handle.fp = stdin; + file_handle.opened_path = NULL; /* This actually destructs the elements of the list - ugly hack */ zend_llist_apply(&global_vars, (llist_apply_func_t) php_register_command_line_global_vars); Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.50 php4/sapi/isapi/php4isapi.c:1.51 --- php4/sapi/isapi/php4isapi.c:1.50 Wed Aug 9 09:45:40 2000 +++ php4/sapi/isapi/php4isapi.c Sun Aug 13 11:00:38 2000 @@ -575,6 +575,7 @@ file_handle.filename = sapi_globals->request_info.path_translated; file_handle.free_filename = 0; file_handle.type = ZEND_HANDLE_FILENAME; + file_handle.opened_path = NULL; php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); Index: php4/sapi/nsapi/nsapi.c diff -u php4/sapi/nsapi/nsapi.c:1.10 php4/sapi/nsapi/nsapi.c:1.11 --- php4/sapi/nsapi/nsapi.c:1.10 Wed Aug 2 15:48:43 2000 +++ php4/sapi/nsapi/nsapi.c Sun Aug 13 11:00:38 2000 @@ -514,6 +514,7 @@ file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; file_handle.free_filename = 0; + file_handle.opened_path = NULL; #if defined(NSAPI_DEBUG) log_error(LOG_INFORM, "nsapi_module_main", NSG(sn), NSG(rq), Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.34 php4/sapi/roxen/roxen.c:1.35 --- php4/sapi/roxen/roxen.c:1.34 Wed Aug 2 15:48:44 2000 +++ php4/sapi/roxen/roxen.c Sun Aug 13 11:00:39 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.34 2000/08/02 22:48:44 rasmus Exp $ */ +/* $Id: roxen.c,v 1.35 2000/08/13 18:00:39 stas Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -447,7 +447,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.34 2000/08/02 22:48:44 rasmus Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.35 2000/08/13 18:00:39 stas Exp $"); /* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -609,6 +609,7 @@ file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = THIS->filename; file_handle.free_filename = 0; + file_handle.opened_path = NULL; THREADS_ALLOW(); res = php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.16 php4/sapi/thttpd/thttpd.c:1.17 --- php4/sapi/thttpd/thttpd.c:1.16 Wed Aug 2 15:48:45 2000 +++ php4/sapi/thttpd/thttpd.c Sun Aug 13 11:00:39 2000 @@ -213,6 +213,7 @@ file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = TG(hc)->expnfilename; file_handle.free_filename = 0; + file_handle.opened_path = NULL; if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { return;