- zend_file_handles must now flag whether their .filename property should be

  free by Zend or not (uses e*() functions)

7 files changed, 9 insertions, 0 deletions

diff --git a/main/main.c b/main/main.c
index 91d0270910..4b715e39a1 100644
--- a/main/main.c
+++ b/main/main.c
@@ -939,6 +939,7 @@ int php_module_startup(sapi_module_struct *sf)
 
 	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 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
 
 	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 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
 	}
 	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 {
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 24f8675982..5a892d43ef 100644
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -389,6 +389,7 @@ php_ns_module_main(NSLS_D SLS_DC)
 
 	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;
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index 3676b2d13a..4ca0ed615c 100644
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -71,6 +71,7 @@ PHPAPI int apache_php_module_main(request_rec *r, int fd, int display_source_mod
 	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;
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 3ed12fe4d5..078a815de2 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -466,6 +466,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 		}
 	}
 
+	file_handle.free_filename = 0;
 	switch (behavior) {
 		case PHP_MODE_STANDARD:
 			php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index affe58b7a2..1fbb41382e 100644
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -444,6 +444,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB)
 	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);
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 80eed97c7a..1ec54f3138 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -605,6 +605,7 @@ static int php_roxen_module_main(SLS_D)
 #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);
diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index d55d62cd1f..e30375ef87 100644
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -349,6 +349,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send
 	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) {