Fix zend_fiel_handle handling. Should fix URL include

and various opened_path inconsistencies.

5 files changed, 5 insertions, 0 deletions

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index a985ebee22..6e5ae10467 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -641,6 +641,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 	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);
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index 441b38d72a..6943ff2074 100644
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -575,6 +575,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB)
 		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);
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 94ac4072f7..210ac1766f 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -514,6 +514,7 @@ nsapi_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;
+	file_handle.opened_path = NULL;
 
 #if defined(NSAPI_DEBUG)
 	log_error(LOG_INFORM, "nsapi_module_main", NSG(sn), NSG(rq),
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 740104da91..62c17a7726 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -609,6 +609,7 @@ static int php_roxen_module_main(SLS_D)
   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);
diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index daef768dfc..fb1fdd3c7a 100644
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -213,6 +213,7 @@ static void thttpd_module_main(TLS_D SLS_DC)
 	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;