php-sapi-ini-file.patch

   1 --- php-5.3.0/main/php_ini.c.org        2009-07-06 17:32:30.309904482 +0200
   2 +++ php-5.3.0/main/php_ini.c    2009-07-06 17:36:45.529879052 +0200
   3 @@ -474,6 +480,24 @@
   4                                 }
   5                         }
   6                 }
   7 +               /* Search (global) php.ini file in search path */
   8 +               if (!fh.handle.fp) {
   9 +                       fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
  10 +                       if (fh.handle.fp) {
  11 +                               fh.filename = php_ini_opened_path;
  12 +                               PG(safe_mode) = safe_mode_state;
  13 +                               PG(open_basedir) = open_basedir;
  14 +                               fh.type = ZEND_HANDLE_FP;
  15 +                               zend_parse_ini_file(&fh, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t) php_ini_parser_cb, &configuration_hash TSRMLS_CC);
  16 +                               safe_mode_state = PG(safe_mode);
  17 +                               open_basedir = PG(open_basedir);
  18 +                               PG(safe_mode) = 0;
  19 +                               PG(open_basedir) = NULL;
  20 +                               fh.handle.fp = NULL;
  21 +                               efree(php_ini_opened_path);
  22 +                               fh.filename = php_ini_opened_path = NULL;
  23 +                       }
  24 +               }
  25
  26                 /* Otherwise search for php-%sapi-module-name%.ini file in search path */
  27                 if (!fh.handle.fp) {
  28 @@ -486,14 +510,6 @@
  29                                 fh.filename = php_ini_opened_path;
  30                         }
  31                 }
  32 -
  33 -               /* If still no ini file found, search for php.ini file in search path */
  34 -               if (!fh.handle.fp) {
  35 -                       fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
  36 -                       if (fh.handle.fp) {
  37 -                               fh.filename = php_ini_opened_path;
  38 -                       }
  39 -               }
  40         }
  41
  42         if (free_ini_search_path) {
  43 @@ -620,12 +620,14 @@
  44                 zend_llist scanned_ini_list;
  45                 zend_llist_element *element;
  46                 int l, total_l = 0;
  47 +               const char *fmt = "%s:" PHP_CONFIG_FILE_PATH "/%s.d";
  48
  49                 /* List of found ini files */
  50                 zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
  51
  52                 /* Split by paths_separator and load ini-files from all paths */
  53 -               path_copy = estrdup(php_ini_scanned_path);
  54 +               path_copy = emalloc(strlen(php_ini_scanned_path) + strlen(fmt) + strlen(sapi_module.name));
  55 +               sprintf(path_copy, fmt, php_ini_scanned_path, sapi_module.name);
  56                 ini_path  = php_strtok_r(path_copy, paths_separator, &last);
  57
  58                 while (ini_path != NULL) {