[PHP-CVS] cvs: php-src /main php_ini.c

[Dmitry Stogov]

dmitry          Thu Aug  3 11:05:09 2006 UTC

  Modified files:              
    /php-src/main       php_ini.c 
  Log:
  In addtion to path to php.ini, PHPRC now may specify full file name
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.143&r2=1.144&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.143 php-src/main/php_ini.c:1.144
--- php-src/main/php_ini.c:1.143        Tue Jul  4 06:38:32 2006
+++ php-src/main/php_ini.c      Thu Aug  3 11:05:09 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ini.c,v 1.143 2006/07/04 06:38:32 dmitry Exp $ */
+/* $Id: php_ini.c,v 1.144 2006/08/03 11:05:09 dmitry Exp $ */
 
 #include "php.h"
 #include "ext/standard/info.h"
@@ -258,6 +258,7 @@
  */
 int php_init_config(TSRMLS_D)
 {
+       char *php_ini_file_name = NULL;
        char *php_ini_search_path = NULL;
        char *open_basedir;
        int free_ini_search_path = 0;
@@ -284,6 +285,7 @@
        open_basedir = PG(open_basedir);
 
        if (sapi_module.php_ini_path_override) {
+               php_ini_file_name = sapi_module.php_ini_path_override;
                php_ini_search_path = sapi_module.php_ini_path_override;
                free_ini_search_path = 0;
        } else if (!sapi_module.php_ini_ignore) {
@@ -314,6 +316,7 @@
                                strcat(php_ini_search_path, paths_separator);
                        }
                        strcat(php_ini_search_path, env_location);
+                       php_ini_file_name = env_location;
                }
 
 #ifdef PHP_WIN32
@@ -418,13 +421,15 @@
        memset(&fh, 0, sizeof(fh));
        /* Check if php_ini_path_override is a file */
        if (!sapi_module.php_ini_ignore) {
-               if (sapi_module.php_ini_path_override && 
sapi_module.php_ini_path_override[0]) {
+               if (php_ini_file_name && php_ini_file_name[0]) {
                        struct stat statbuf;
        
-                       if (!VCWD_STAT(sapi_module.php_ini_path_override, 
&statbuf)) {
+                       if (!VCWD_STAT(php_ini_file_name, &statbuf)) {
                                if (!((statbuf.st_mode & S_IFMT) == S_IFDIR)) {
-                                       fh.handle.fp = 
VCWD_FOPEN(sapi_module.php_ini_path_override, "r");
-                                       fh.filename = 
sapi_module.php_ini_path_override;
+                                       fh.handle.fp = 
VCWD_FOPEN(php_ini_file_name, "r");
+                                       if (fh.handle.fp) {
+                                               fh.filename = 
php_ini_opened_path = expand_filepath(php_ini_file_name, NULL TSRMLS_CC);
+                                       }
                                }
                        }
                }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php