cvs: /php4 main.c /php4/sapi/aolserver aolserver.c /php4/sapi/apache sapi_apache.c /php4/sapi/cgi cgi_main.c /php4/sapi/isapi php4isapi.c
/php4/sapi/roxen roxen.c /php4/sapi/servlet servlet.c

zeev Sat Dec 4 08:26:12 1999 EDT Modified files: /php4 main.c /php4/sapi/aolserver aolserver.c /php4/sapi/apache sapi_apache.c /php4/sapi/cgi cgi_main.c /php4/sapi/isapi php4isapi.c /php4/sapi/roxen roxen.c /php4/sapi/servlet servlet.c Log: - zend_file_handles must now flag whether their .filename property should be free by Zend or not (uses e*() functions) Index: php4/main.c diff -u php4/main.c:1.146 php4/main.c:1.147 --- php4/main.c:1.146 Fri Dec 3 10:16:32 1999 +++ php4/main.c Sat Dec 4 08:25:38 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.146 1999/12/03 15:16:32 sas Exp $ */ +/* $Id: main.c,v 1.147 1999/12/04 13:25:38 zeev Exp $ */ #include <stdio.h> @@ -939,6 +939,7 @@ zuv.short_tags = (unsigned char) PG(short_tags); zuv.asp_tags = (unsigned char) PG(asp_tags); + zuv.import_use_extension = ".php"; zend_set_utility_values(&zuv); php_startup_SAPI_content_types(); @@ -1213,6 +1214,7 @@ if (PG(auto_prepend_file) && PG(auto_prepend_file)[0]) { prepend_file.filename = PG(auto_prepend_file); + prepend_file.free_filename = 0; prepend_file.type = ZEND_HANDLE_FILENAME; prepend_file_p = &prepend_file; } else { @@ -1220,6 +1222,7 @@ } if (PG(auto_append_file) && PG(auto_append_file)[0]) { append_file.filename = PG(auto_append_file); + append_file.free_filename = 0; append_file.type = ZEND_HANDLE_FILENAME; append_file_p = &append_file; } else { Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.19 php4/sapi/aolserver/aolserver.c:1.20 --- php4/sapi/aolserver/aolserver.c:1.19 Fri Dec 3 06:46:04 1999 +++ php4/sapi/aolserver/aolserver.c Sat Dec 4 08:25:38 1999 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.19 1999/12/03 11:46:04 sas Exp $ */ +/* $Id: aolserver.c,v 1.20 1999/12/04 13:25:38 zeev Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -196,7 +196,7 @@ int uptime = Ns_InfoUptime(); PUTS("<table border=5 width=600>\n"); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.19 1999/12/03 11:46:04 sas Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.20 1999/12/04 13:25:38 zeev 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()); @@ -389,6 +389,7 @@ file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = SG(request_info).path_translated; + file_handle.free_filename = 0; if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { return NS_ERROR; Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.2 php4/sapi/apache/sapi_apache.c:1.3 --- php4/sapi/apache/sapi_apache.c:1.2 Sat Oct 30 10:22:10 1999 +++ php4/sapi/apache/sapi_apache.c Sat Dec 4 08:25:39 1999 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.2 1999/10/30 14:22:10 rasmus Exp $ */ +/* $Id: sapi_apache.c,v 1.3 1999/12/04 13:25:39 zeev Exp $ */ #include "php.h" @@ -71,6 +71,7 @@ file_handle.type = ZEND_HANDLE_FD; file_handle.handle.fd = fd; file_handle.filename = SG(request_info).path_translated; + file_handle.free_filename = 0; if (display_source_mode) { zend_syntax_highlighter_ini syntax_highlighter_ini; Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.5 php4/sapi/cgi/cgi_main.c:1.6 --- php4/sapi/cgi/cgi_main.c:1.5 Tue Nov 23 15:25:55 1999 +++ php4/sapi/cgi/cgi_main.c Sat Dec 4 08:25:39 1999 @@ -466,6 +466,7 @@ } } + file_handle.free_filename = 0; switch (behavior) { case PHP_MODE_STANDARD: php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.5 php4/sapi/isapi/php4isapi.c:1.6 --- php4/sapi/isapi/php4isapi.c:1.5 Fri Dec 3 07:21:57 1999 +++ php4/sapi/isapi/php4isapi.c Sat Dec 4 08:25:40 1999 @@ -444,6 +444,7 @@ SG(server_context) = lpECB; file_handle.filename = sapi_globals->request_info.path_translated; + file_handle.free_filename = 0; file_handle.type = ZEND_HANDLE_FILENAME; php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.5 php4/sapi/roxen/roxen.c:1.6 --- php4/sapi/roxen/roxen.c:1.5 Wed Nov 24 21:05:35 1999 +++ php4/sapi/roxen/roxen.c Sat Dec 4 08:25:41 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.5 1999/11/25 02:05:35 neotron Exp $ */ +/* $Id: roxen.c,v 1.6 1999/12/04 13:25:41 zeev Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -458,7 +458,7 @@ char buf[512]; PUTS("<table border=5 width=600>\n"); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.5 1999/11/25 02:05:35 neotron Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.6 1999/12/04 13:25:41 zeev 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()); @@ -605,6 +605,7 @@ #endif file_handle.type = ZEND_HANDLE_FILENAME; file_handle.filename = THIS->filename; + file_handle.free_filename = 0; THREADS_ALLOW(); fprintf(stderr, "Request Startup.\n"); res = php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.1 php4/sapi/servlet/servlet.c:1.2 --- php4/sapi/servlet/servlet.c:1.1 Mon Nov 29 10:36:25 1999 +++ php4/sapi/servlet/servlet.c Sat Dec 4 08:25:41 1999 @@ -349,6 +349,7 @@ SETSTRING( SG(request_info).path_translated, pathTranslated ); file_handle.handle.fp = php3_fopen_for_parser(); file_handle.filename = SG(request_info).path_translated; + file_handle.free_filename = 0; file_handle.type = ZEND_HANDLE_FP; if (!file_handle.handle.fp) {