X-Git-Url: http://git.pld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php-sapi-ini-file.patch;h=0ed4d799f2bd6d7085e67c244c3bc9817847dd29;hp=d42f15b4d570c3cbc5894db2be0ed14f24e70e58;hb=1b0fa114d6f54a44237c529b9d5894a51cfa5ac3;hpb=76178fddebceacb12ce8000f092333cbee4c1c9a

diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index d42f15b..0ed4d79 100644
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -1,6 +1,11 @@
---- php-5.5.21/main/php_ini.c	2015-01-21 12:23:27.000000000 +0200
-+++ php-5.5.21/main/php_ini.c	2015-02-25 01:40:21.335354971 +0200
-@@ -378,12 +378,19 @@
+to test which is main php.ini:
+$ php -r 'var_dump(array(get_cfg_var("cfg_file_path"),php_ini_loaded_file()));'
+
+https://github.com/pld-linux/php/commit/762ec2e
+
+--- php-7.0.0RC6.orig/main/php_ini.c	2015-11-10 23:58:52.227101032 +0200
++++ php-7.0.0RC6/main/php_ini.c	2015-11-11 00:01:43.502674750 +0200
+@@ -375,12 +375,19 @@
  }
  /* }}} */
  
@@ -11,7 +16,7 @@
 +
  /* {{{ php_init_config
   */
- int php_init_config(TSRMLS_D)
+ int php_init_config(void)
  {
  	char *php_ini_file_name = NULL;
  	char *php_ini_search_path = NULL;
@@ -20,15 +25,15 @@
  	int php_ini_scanned_path_len;
  	char *open_basedir;
  	int free_ini_search_path = 0;
-@@ -561,8 +568,29 @@
+@@ -557,8 +564,26 @@
  				}
  			}
  		}
 +		/* Search (global) php.ini file in search path */
 +		if (!fh.handle.fp) {
-+			fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
++			fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &opened_path);
 +			if (fh.handle.fp) {
-+				fh.filename = php_ini_opened_path;
++				fh.filename = ZSTR_VAL(opened_path);
 +
 +				// parse the ini file now
 +				PG(open_basedir) = open_basedir;
@@ -37,49 +42,65 @@
 +				open_basedir = PG(open_basedir);
 +				PG(open_basedir) = NULL;
 +				fh.handle.fp = NULL;
- 
--		/* Otherwise search for php-%sapi-module-name%.ini file in search path */
-+				// save this for later
-+				php_ini_loaded_file = estrdup(php_ini_opened_path);
 +
-+				efree(php_ini_opened_path);
-+				fh.filename = php_ini_opened_path = NULL;
++				php_ini_loaded_file = estrdup(fh.filename);
++				fh.filename = NULL;
 +			}
 +		}
-+
+ 
+-		/* Otherwise search for php-%sapi-module-name%.ini file in search path */
 +		/* Also search for php-%sapi-module-name%.ini file in search path */
  		if (!fh.handle.fp) {
  			const char *fmt = "php-%s.ini";
  			char *ini_fname;
-@@ -572,13 +600,10 @@
+@@ -568,15 +593,8 @@
  			if (fh.handle.fp) {
- 				fh.filename = php_ini_opened_path;
+ 				fh.filename = ZSTR_VAL(opened_path);
  			}
 -		}
  
 -		/* If still no ini file found, search for php.ini file in search path */
 -		if (!fh.handle.fp) {
--			fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
+-			fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &opened_path);
 -			if (fh.handle.fp) {
--				fh.filename = php_ini_opened_path;
-+			// restore previous value, so php_ini_loaded_file() works as expected
-+			if (php_ini_loaded_file) {
-+				php_ini_opened_path = php_ini_loaded_file;
- 			}
- 		}
+-				fh.filename = ZSTR_VAL(opened_path);
+-			}
+-		}
++ 		}
  	}
-@@ -597,6 +622,10 @@
+ 
+ 	if (free_ini_search_path) {
+@@ -593,14 +611,28 @@
  
  		{
  			zval tmp;
 +			// use main php.ini if loaded
++			// see https://github.com/pld-linux/php/commit/762ec2e
++			// test with:
++			// php -r 'var_dump(array(get_cfg_var("cfg_file_path"),php_ini_loaded_file()));'
 +			if (php_ini_loaded_file) {
++				if (fh.filename) {
++					efree((char *)fh.filename);
++				}
 +				fh.filename = php_ini_loaded_file;
 +			}
  
- 			Z_STRLEN(tmp) = strlen(fh.filename);
- 			Z_STRVAL(tmp) = zend_strndup(fh.filename, Z_STRLEN(tmp));
-@@ -630,13 +659,15 @@
+ 			ZVAL_NEW_STR(&tmp, zend_string_init(fh.filename, strlen(fh.filename), 1));
+ 			zend_hash_str_update(&configuration_hash, "cfg_file_path", sizeof("cfg_file_path")-1, &tmp);
+ 			if (opened_path) {
+ 				zend_string_release_ex(opened_path, 0);
+-			} else {
++			}
++
++			if (fh.filename) {
+ 				efree((char *)fh.filename);
++				fh.filename = NULL;
+ 			}
++
+ 			php_ini_opened_path = zend_strndup(Z_STRVAL(tmp), Z_STRLEN(tmp));
+ 		}
+ 	}
+@@ -624,13 +656,15 @@
  		zend_llist scanned_ini_list;
  		zend_llist_element *element;
  		int l, total_l = 0;
@@ -96,9 +117,9 @@
  		for (debpath = bufpath ; debpath ; debpath=endpath) {
  			endpath = strchr(debpath, DEFAULT_DIR_SEPARATOR);
  			if (endpath) {
-@@ -649,7 +680,7 @@
+@@ -643,7 +677,7 @@
  			}
- 			lenpath = strlen(debpath);
+ 			lenpath = (int)strlen(debpath);
  
 -			if (lenpath > 0 && (ndir = php_scandir(debpath, &namelist, 0, php_alphasort)) > 0) {
 +			if (lenpath > 0 && (ndir = php_scandir(debpath, &namelist, 0, php_csort)) > 0) {