php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Z_TYPE(filehandle)?? ok.. whatever... ;)

Browse Source
This commit is contained in:
Sterling Hughes
2001-11-26 18:57:44 +00:00
parent 7cd6ccc0ec
commit b91a66699c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/fopen_wrappers.c
+1 -1
View File
@@ -360,7 +360,7 @@ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC)
file_handle->filename = SG(request_info).path_translated;
file_handle->free_filename = 0;
file_handle->handle.fp = fp;
Z_TYPE_P(file_handle) = ZEND_HANDLE_FP;
file_handle->type = ZEND_HANDLE_FP;
return SUCCESS;
}
main/main.c
+3 -3
View File
@@ -1282,7 +1282,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
PG(during_request_startup) = 0;
if (Z_TYPE_P(primary_file) == ZEND_HANDLE_FILENAME
if (primary_file->type == ZEND_HANDLE_FILENAME
&& primary_file->filename) {
VCWD_GETCWD(old_cwd, OLD_CWD_SIZE-1);
VCWD_CHDIR_FILE(primary_file->filename);
@@ -1292,7 +1292,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
prepend_file.filename = PG(auto_prepend_file);
prepend_file.opened_path = NULL;
prepend_file.free_filename = 0;
Z_TYPE(prepend_file) = ZEND_HANDLE_FILENAME;
prepend_file.type = ZEND_HANDLE_FILENAME;
prepend_file_p = &prepend_file;
} else {
prepend_file_p = NULL;
@@ -1301,7 +1301,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
append_file.filename = PG(auto_append_file);
append_file.opened_path = NULL;
append_file.free_filename = 0;
Z_TYPE(append_file) = ZEND_HANDLE_FILENAME;
append_file.type = ZEND_HANDLE_FILENAME;
append_file_p = &append_file;
} else {
append_file_p = NULL;
main/php_ini.c
+1 -1
View File
@@ -262,7 +262,7 @@ int php_init_config(char *php_ini_path_override)
if (!fh.handle.fp) {
return SUCCESS; /* having no configuration file is ok */
}
Z_TYPE(fh) = ZEND_HANDLE_FP;
fh.type = ZEND_HANDLE_FP;
fh.filename = php_ini_opened_path;
zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);