diff options
| author | Zeev Suraski <zeev@php.net> | 1999-06-19 13:18:48 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-06-19 13:18:48 +0000 |
| commit | 57882d58e1e4aaf8b9177c59cd5d8b79dbb44da2 (patch) | |
| tree | 265179a058d820e45a81f4da87c23ddb34c9d011 /main | |
| parent | 63a845f2f6fda873375c13a763e9566067e6a7ee (diff) | |
| download | php-git-57882d58e1e4aaf8b9177c59cd5d8b79dbb44da2.tar.gz | |
Use php.ini instead of php3.ini
Diffstat (limited to 'main')
| -rw-r--r-- | main/config.w32.h | 2 | ||||
| -rw-r--r-- | main/configuration-parser.y | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/config.w32.h b/main/config.w32.h index ba09bd7ee0..d0c2ae7a29 100644 --- a/main/config.w32.h +++ b/main/config.w32.h @@ -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 */ diff --git a/main/configuration-parser.y b/main/configuration-parser.y index 0f4a57d0fc..fecfc323df 100644 --- a/main/configuration-parser.y +++ b/main/configuration-parser.y @@ -211,7 +211,7 @@ int php3_init_config(void) } 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 @@ int php3_init_config(void) 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); } |