CVS update: php4

Date: Saturday June 19, 1999 @ 9:18 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv28850 Modified Files: cgi_main.c config.w32.h configuration-parser.y Log Message: Use php.ini instead of php3.ini Index: php4/cgi_main.c diff -u php4/cgi_main.c:1.18 php4/cgi_main.c:1.19 --- php4/cgi_main.c:1.18 Tue Jun 15 13:06:21 1999 +++ php4/cgi_main.c Sat Jun 19 09:18:46 1999 @@ -145,7 +145,7 @@ " -s Display colour syntax highlighted source.\n" " -f<file> Parse <file>. Implies `-q'\n" " -v Version number\n" - " -c<path> Look for php4.ini file in this directory\n" + " -c<path> Look for php.ini file in this directory\n" #if SUPPORT_INTERACTIVE " -a Run interactively\n" #endif @@ -235,7 +235,7 @@ --disable-force-cgi-redirect switch. If you do this and you have your PHP CGI\n\ binary accessible somewhere in your web tree, people will be able to circumvent\n\ .htaccess security by loading files through the PHP parser. A good way around\n\ -this is to define doc_root in your php4.ini file to something other than your\n\ +this is to define doc_root in your php.ini file to something other than your\n\ top-level DOCUMENT_ROOT. This way you can separate the part of your web space\n\n\ which uses PHP from the normal part using .htaccess security. If you do not have\n\ any .htaccess restrictions anywhere on your site you can leave doc_root undefined.\n\ Index: php4/config.w32.h diff -u php4/config.w32.h:1.6 php4/config.w32.h:1.7 --- php4/config.w32.h:1.6 Wed Jun 16 23:45:20 1999 +++ php4/config.w32.h Sat Jun 19 09:18:46 1999 @@ -21,7 +21,7 @@ #define PHP_SAFE_MODE 0 #define MAGIC_QUOTES 0 /* This is the default configuration file to read */ -#define CONFIGURATION_FILE_PATH "php3.ini" +#define CONFIGURATION_FILE_PATH "php.ini" #define USE_CONFIG_FILE 1 /* Undefine if you want stricter XML/SGML compliance by default */ Index: php4/configuration-parser.y diff -u php4/configuration-parser.y:1.13 php4/configuration-parser.y:1.14 --- php4/configuration-parser.y:1.13 Thu May 20 08:06:43 1999 +++ php4/configuration-parser.y Sat Jun 19 09:18:46 1999 @@ -30,7 +30,7 @@ -/* $Id: configuration-parser.y,v 1.13 1999/05/20 12:06:43 andi Exp $ */ +/* $Id: configuration-parser.y,v 1.14 1999/06/19 13:18:46 zeev Exp $ */ #define DEBUG_CFG_PARSER 1 #include "php.h" @@ -211,7 +211,7 @@ } PG(safe_mode) = 0; PG(open_basedir) = NULL; - cfgin = php3_fopen_with_path("php3.ini","r",php_ini_path,&opened_path); + cfgin = php3_fopen_with_path("php.ini","r",php_ini_path,&opened_path); free(php_ini_path); if (free_default_location) { free(default_location); @@ -242,7 +242,7 @@ init_cfg_scanner(); active__php3_hash_table = &configuration_hash; parsing_mode = PARSING_MODE_CFG; - currently_parsed_filename = "php3.ini"; + currently_parsed_filename = "php.ini"; yyparse(); fclose(cfgin); }