cvs: /php4 main.c

ssb Mon Feb 14 07:37:15 2000 EDT Modified files: /php4 main.c Log: @Re-introduced "none" for disabling auto_prepend/append_file (Stig) Made auto_prepend_file and auto_append_file accept "none" as parameter to disable, like in PHP 3.0. Index: php4/main.c diff -u php4/main.c:1.206 php4/main.c:1.207 --- php4/main.c:1.206 Sun Feb 13 05:25:01 2000 +++ php4/main.c Mon Feb 14 07:36:45 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.206 2000/02/13 13:25:01 andi Exp $ */ +/* $Id: main.c,v 1.207 2000/02/14 15:36:45 ssb Exp $ */ #include <stdio.h> @@ -1107,7 +1107,8 @@ 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 @@ } 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;