- fixed SEGV when .ini file exists, but cannot be read

Changed files:
    php-sapi-ini-file.patch -> 1.4

diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index f726b5f6042c1cb1eed9b9c503064bc188ade4c3..94ec00941d6bf5409a3b0ad226bd5b22f77df688 100644 (file)
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -9,16 +9,16 @@
 +                      fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
 +                      if (fh.handle.fp) {
 +                              fh.filename = php_ini_opened_path;
++                              PG(safe_mode) = safe_mode_state;
++                              PG(open_basedir) = open_basedir;
++                              fh.type = ZEND_HANDLE_FP;
++                              zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
++                              safe_mode_state = PG(safe_mode);
++                              open_basedir = PG(open_basedir);
++                              PG(safe_mode) = 0;
++                              PG(open_basedir) = NULL;
++                              fh.handle.fp = NULL;
 +                      }
-+                      PG(safe_mode) = safe_mode_state;
-+                      PG(open_basedir) = open_basedir;
-+                      fh.type = ZEND_HANDLE_FP;
-+                      zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
-+                      safe_mode_state = PG(safe_mode);
-+                      open_basedir = PG(open_basedir);
-+                      PG(safe_mode) = 0;
-+                      PG(open_basedir) = NULL;
-+                      fh.handle.fp = NULL;
 +              }
                /* Search php-%sapi-module-name%.ini file in search path */
                if (!fh.handle.fp) {