---- php-4.2.1/main/php_ini.c.orig Tue Mar 5 01:21:28 2002
-+++ php-4.2.1/main/php_ini.c Wed Jun 12 18:10:30 2002
-@@ -204,6 +204,8 @@
- char *env_location, *php_ini_search_path;
- int safe_mode_state;
- char *open_basedir;
-+ char *sapi_ini_filename;
-+ char *sapi_ini_opened_path;
- int free_ini_search_path=0;
- zend_file_handle fh;
- TSRMLS_FETCH();
-@@ -264,15 +266,10 @@
- PG(open_basedir) = NULL;
-
- fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
-- if (free_ini_search_path) {
-- efree(php_ini_search_path);
-- }
- PG(safe_mode) = safe_mode_state;
- PG(open_basedir) = open_basedir;
+--- php-5.2.7/main/php_ini.c.org 2008-12-05 23:30:07.843241117 +0100
++++ php-5.2.7/main/php_ini.c 2008-12-05 23:36:18.096968965 +0100
+@@ -475,21 +475,32 @@
+ }
+ }
-- if (!fh.handle.fp) {
-- return SUCCESS; /* having no configuration file is ok */
-- }
-+ if (fh.handle.fp) {
- fh.type = ZEND_HANDLE_FP;
- fh.filename = php_ini_opened_path;
+- /* Otherwise search for php-%sapi-module-name%.ini file in search path */
++ /* Search (global) php.ini file in search path */
+ if (!fh.handle.fp) {
+- const char *fmt = "php-%s.ini";
+- char *ini_fname;
+- spprintf(&ini_fname, 0, fmt, sapi_module.name);
+- fh.handle.fp = php_fopen_with_path(ini_fname, "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
+- efree(ini_fname);
++ 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;
++ efree(php_ini_opened_path);
++ fh.filename = php_ini_opened_path = NULL;
+ }
+ }
-@@ -288,7 +285,31 @@
- efree(php_ini_opened_path);
- php_ini_opened_path = zend_strndup(Z_STRVAL(tmp), Z_STRLEN(tmp));
- }
--
-+ }
-+
-+ sapi_ini_filename = do_alloca(7+1+strlen(sapi_module.name)+1);
-+ if(sapi_ini_filename == NULL) {
-+ if (free_ini_search_path)
-+ efree(php_ini_search_path);
-+ return SUCCESS;
-+ }
-+ sprintf(sapi_ini_filename,"php-%s.ini",sapi_module.name);
-+ fh.handle.fp = php_fopen_with_path(sapi_ini_filename, "r", php_ini_search_path, &sapi_ini_opened_path TSRMLS_CC);
-+ if (free_ini_search_path) {
-+ efree(php_ini_search_path);
-+ }
-+ if (!fh.handle.fp) {
-+ return SUCCESS; /* having no configuration file is ok */
-+ }
-+ fh.type = ZEND_HANDLE_FP;
-+ fh.filename = sapi_ini_opened_path;
-+
-+ zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
-+
-+ if (sapi_ini_opened_path)
-+ efree(sapi_ini_opened_path);
-+ free_alloca(sapi_ini_filename);
+- /* If still no ini file found, search for php.ini file in search path */
++ /* Otherwise search for php-%sapi-module-name%.ini file in search path */
+ if (!fh.handle.fp) {
+- fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
++ const char *fmt = "php-%s.ini";
++ char *ini_fname;
++ spprintf(&ini_fname, 0, fmt, sapi_module.name);
++ fh.handle.fp = php_fopen_with_path(ini_fname, "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
++ efree(ini_fname);
+ if (fh.handle.fp) {
+ fh.filename = php_ini_opened_path;
+ }
+@@ -533,9 +544,13 @@
+ /* Scan and parse any .ini files found in scan path if path not empty. */
+ if (!sapi_module.php_ini_ignore && php_ini_scanned_path_len) {
+ struct dirent **namelist;
+- int ndir, i;
++ int ndir, i, found = 0;
++ const char *fmt = PHP_CONFIG_FILE_PATH "/%s.d";
++ char *sapi_scan_dir = emalloc(strlen(fmt) + strlen(sapi_module.name));
++ sprintf(sapi_scan_dir, fmt, sapi_module.name);
+
+ if ((ndir = php_scandir(php_ini_scanned_path, &namelist, 0, php_alphasort)) > 0) {
++ found += ndir;
+ for (i = 0; i < ndir; i++) {
+ /* check for a .ini extension */
+ if (!(p = strrchr(namelist[i]->d_name, '.')) || (p && strcmp(p, ".ini"))) {
+@@ -564,6 +579,38 @@
+ free(namelist[i]);
+ }
+ free(namelist);
++ }
++
++ if ((ndir = php_scandir(sapi_scan_dir, &namelist, 0, php_alphasort)) > 0) {
++ found += ndir;
++ for (i = 0; i < ndir; i++) {
++ /* check for a .ini extension */
++ if (!(p = strrchr(namelist[i]->d_name, '.')) || (p && strcmp(p, ".ini"))) {
++ free(namelist[i]);
++ continue;
++ }
++ snprintf(ini_file, MAXPATHLEN, "%s%c%s", sapi_scan_dir, DEFAULT_SLASH, namelist[i]->d_name);
++ if (VCWD_STAT(ini_file, &sb) == 0) {
++ if (S_ISREG(sb.st_mode)) {
++ if ((fh.handle.fp = VCWD_FOPEN(ini_file, "r"))) {
++ fh.filename = ini_file;
++ fh.type = ZEND_HANDLE_FP;
++ zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
++ /* Here, add it to the list of ini files read */
++ l = strlen(ini_file);
++ total_l += l + 2;
++ p = estrndup(ini_file, l);
++ zend_llist_add_element(&scanned_ini_list, &p);
++ }
++ }
++ }
++ free(namelist[i]);
++ }
++ free(namelist);
++ }
++ efree(sapi_scan_dir);
+
- return SUCCESS;
- }
- /* }}} */
++ if (found) {
+
+ /*
+ * Don't need an extra byte for the \0 in this malloc as the last
projects / packages / php.git / blobdiff