dmitry          Thu Aug  3 11:04:52 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS 
    /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/NEWS?r1=1.2027.2.547.2.177&r2=1.2027.2.547.2.178&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.177 php-src/NEWS:1.2027.2.547.2.178
--- php-src/NEWS:1.2027.2.547.2.177     Thu Aug  3 09:56:49 2006
+++ php-src/NEWS        Thu Aug  3 11:04:52 2006
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Aug 2006, PHP 5.2.0RC2
+- In addtion to path to php.ini, PHPRC now may specify full file name. (Dmitry)
 - Added "PHPINIDir" Apache directive to apache and apache_hooks SAPIs. (Dmitry)
 - Added an optional boolean parameter to memory_get_usage() and 
   memory_get_peak_usage() to get memory size allocated by emalloc() or real
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.1&r2=1.136.2.4.2.2&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.1 
php-src/main/php_ini.c:1.136.2.4.2.2
--- php-src/main/php_ini.c:1.136.2.4.2.1        Tue Jul  4 06:35:49 2006
+++ php-src/main/php_ini.c      Thu Aug  3 11:04:52 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ini.c,v 1.136.2.4.2.1 2006/07/04 06:35:49 dmitry Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.2 2006/08/03 11:04:52 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;
        int safe_mode_state;
        char *open_basedir;
@@ -286,6 +287,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) {
@@ -316,6 +318,7 @@
                                strcat(php_ini_search_path, paths_separator);
                        }
                        strcat(php_ini_search_path, env_location);
+                       php_ini_file_name = env_location;
                }
 
 #ifdef PHP_WIN32
@@ -421,13 +424,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

Reply via email to