php-sapi-ini-file.patch

   1 --- php-5.0.4/main/php_ini.c.orig       2004-09-17 04:48:47.000000000 +0200
   2 +++ php-5.0.4/main/php_ini.c    2005-04-04 23:07:48.461211584 +0200
   3 @@ -430,6 +430,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, php_config_ini_parser_cb, &extension_lists);
  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                 /* Search php-%sapi-module-name%.ini file in search path */
  26                 if (!fh.handle.fp) {
  27                         const char *fmt = "php-%s.ini";
  28 @@ -441,13 +459,6 @@
  29                                 fh.filename = php_ini_opened_path;
  30                         }
  31                 }
  32 -               /* Search php.ini file in search path */
  33 -               if (!fh.handle.fp) {
  34 -                       fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
  35 -                       if (fh.handle.fp) {
  36 -                               fh.filename = php_ini_opened_path;
  37 -                       }
  38 -               }
  39         }
  40
  41         if (free_ini_search_path) {