- updated to 5.4.45

[packages/php.git] / php-sapi-ini-file.patch

diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index e282b98c29ba1a59e615d9088aa9e9a6254a8677..7ceb984e8d3874d22d2822564162237e2cc20360 100644 (file)
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -1,5 +1,5 @@
---- php-5.3.0/main/php_ini.c   2009-07-06 17:36:45.529879052 +0200
-+++ php-5.3.2/main/php_ini.c   2010-03-17 17:55:16.800313459 +0200
+--- php-5.4.0RC3/main/php_ini.c~       2011-12-10 03:35:27.000000000 +0200
++++ php-5.4.0RC3/main/php_ini.c        2011-12-10 03:36:08.930154336 +0200
 @@ -358,6 +358,11 @@
  }
  /* }}} */
@@ -21,13 +21,13 @@
 +                      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(safe_mode) = safe_mode_state;
 +                              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);
-+                              safe_mode_state = PG(safe_mode);
++                              //safe_mode_state = PG(safe_mode);
 +                              open_basedir = PG(open_basedir);
-+                              PG(safe_mode) = 0;
++                              //PG(safe_mode) = 0;
 +                              PG(open_basedir) = NULL;
 +                              fh.handle.fp = NULL;
 +                              efree(php_ini_opened_path);
@@ -52,7 +52,7 @@
        }
  
        if (free_ini_search_path) {
-@@ -610,12 +625,14 @@
+@@ -627,12 +627,14 @@
                zend_llist scanned_ini_list;
                zend_llist_element *element;
                int l, total_l = 0;
@@ -60,7 +60,7 @@
  
                /* List of found ini files */
                zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
-               
+ 
                /* Split by paths_separator and load ini-files from all paths */
 -              path_copy = estrdup(php_ini_scanned_path);
 +              path_copy = emalloc(strlen(php_ini_scanned_path) + strlen(fmt) + strlen(sapi_module.name));