archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

@Re-introduced "none" for disabling auto_prepend/append_file (Stig)

Browse source 
Made auto_prepend_file and auto_append_file accept "none" as parameter
to disable, like in PHP 3.0.
This commit is contained in:
Stig Bakken 2000-02-14 15:36:45 +00:00
parent 475b31f1e0
commit e24bb8c492
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main/main.c
View file

@ -1107,7 +1107,8 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
UpdateIniFromRegistry(primary_file->filename);
#endif
if (PG(auto_prepend_file) && PG(auto_prepend_file)[0]) {
if (PG(auto_prepend_file) && PG(auto_prepend_file)[0] &&
strncmp(PG(auto_prepend_file), "none", 4) != 0) {
prepend_file.filename = PG(auto_prepend_file);
prepend_file.free_filename = 0;
prepend_file.type = ZEND_HANDLE_FILENAME;
@ -1115,7 +1116,8 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
} else {
prepend_file_p = NULL;
}
if (PG(auto_append_file) && PG(auto_append_file)[0]) {
if (PG(auto_append_file) && PG(auto_append_file)[0] &&
strncmp(PG(auto_prepend_file), "none", 4) != 0) {
append_file.filename = PG(auto_append_file);
append_file.free_filename = 0;
append_file.type = ZEND_HANDLE_FILENAME;