Use php.ini instead of php3.ini

diff --git a/cgi_main.c b/cgi_main.c
index c98d56e1db9cdcc718cf5027aec10578fb56f826..520b9e2f377834cf5aafb20d1a67ac4d2bf6a9d8 100644 (file)
--- a/cgi_main.c
+++ b/cgi_main.c
@@ -145,7 +145,7 @@ static void php_cgi_usage(char *argv0)
                                "  -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 @@ set.  This variable is set, for example, by Apache's Action directive redirect.\
 --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\

diff --git a/main/config.w32.h b/main/config.w32.h
index ba09bd7ee0373f62f44e75cbf61ac37ebc79113f..d0c2ae7a29aefb77d7d1c2e6b9019fa9c0f816cc 100644 (file)
--- 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 0f4a57d0fc4c1bf5c966199eecd19cd3b46103d9..fecfc323df1990a23f7fff4dbc7653c7d9d3d00d 100644 (file)
--- 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);
        }

diff --git a/win32/sendmail.c b/win32/sendmail.c
index 2a32cff950718a9a8e8565855d77b95092e748bb..659bc134a4cb78543c819d9f35357458ad1dc5b8 100644 (file)
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -86,7 +86,7 @@ static char *ErrorMessages[] =
        {"Bad Message Return Path"},
        {"Bad Mail Host"},
        {"Bad Message File"},
-       {"PHP Internal error: php3.ini sendmail from variable not set!"}
+       {"PHP Internal error: php.ini sendmail from variable not set!"}
 };