clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
free by Zend or not (uses e*() functions)
This commit is contained in:
Zeev Suraski 1999-12-04 13:25:41 +00:00
parent 502bb337fe
commit da5464b145
7 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/main.c
View File

@ -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 {

1
sapi/aolserver/aolserver.c
View File

@ -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;

1
sapi/apache/sapi_apache.c
View File

@ -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;

1
sapi/cgi/cgi_main.c
View File

@ -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);

1
sapi/isapi/php4isapi.c
View File

@ -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);

1
sapi/roxen/roxen.c
View File

@ -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);

1
sapi/servlet/servlet.c
View File

@ -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) {