- char *php_ini_file_name = NULL;
- char *php_ini_search_path = NULL;
-+ // value for php_ini_loaded_file() to be stored into php_ini_opened_path
-+ char *php_ini_loaded_file = NULL;
- int php_ini_scanned_path_len;
- char *open_basedir;
- int free_ini_search_path = 0;
-@@ -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, &opened_path);
-+ if (fh.handle.fp) {
-+ fh.filename = ZSTR_VAL(opened_path);
-+
-+ // parse the ini file now
-+ PG(open_basedir) = open_basedir;
-+ fh.type = ZEND_HANDLE_FP;
-+ zend_parse_ini_file(&fh, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t) php_ini_parser_cb, &configuration_hash TSRMLS_CC);
-+ open_basedir = PG(open_basedir);
-+ PG(open_basedir) = NULL;
-+ fh.handle.fp = 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;
-@@ -568,15 +593,8 @@
- if (fh.handle.fp) {
- 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, &opened_path);
-- if (fh.handle.fp) {
-- fh.filename = ZSTR_VAL(opened_path);
-- }
-- }
-+ }
- }
-
- 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;
-+ }
-
- 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(opened_path);
-- } 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 @@