diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-04 13:25:41 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-04 13:25:41 +0000 |
| commit | da5464b145be141a4b9a7130d554f73e022acc85 (patch) | |
| tree | 96fe417491a97c49b3c9cc3b3d6557107fa3205d /main | |
| parent | 502bb337fe4b4df88dcc5531c62326ed49a08b2e (diff) | |
| download | php-git-da5464b145be141a4b9a7130d554f73e022acc85.tar.gz | |
- zend_file_handles must now flag whether their .filename property should be
free by Zend or not (uses e*() functions)
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 3 |
1 files changed, 3 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 { |