Author: arekm Date: Mon Jul 6 13:57:38 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
Backport from
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?view=log&pathrev=MAIN
---- Files affected:
packages/php:
php-sapi-ini-file.patch (1.9 -> 1.9.2.1)
---- Diffs:
================================================================
Index: packages/php/php-sapi-ini-file.patch
diff -u packages/php/php-sapi-ini-file.patch:1.9
packages/php/php-sapi-ini-file.patch:1.9.2.1
--- packages/php/php-sapi-ini-file.patch:1.9 Sat Dec 6 04:00:58 2008
+++ packages/php/php-sapi-ini-file.patch Mon Jul 6 15:57:32 2009
@@ -1,106 +1,154 @@
---- php-5.2.7/main/php_ini.c 2008-08-14 19:34:30.000000000 +0300
-+++ php-5.2.7-inidir/main/php_ini.c 2008-12-05 12:53:24.747685251 +0200
-@@ -474,6 +474,24 @@
- }
- }
- }
-+ /* Search (global) php.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);
-+ 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;
-+ }
-+ }
-
- /* Otherwise search for php-%sapi-module-name%.ini file in
search path */
- if (!fh.handle.fp) {
-@@ -486,14 +504,6 @@
- fh.filename = php_ini_opened_path;
- }
- }
+--- php-src/main/php_ini.c 2009/05/18 21:28:42 1.173
++++ php-src/main/php_ini.c 2009/06/27 15:22:06 1.174
+@@ -349,7 +349,8 @@
+ char *open_basedir;
+ int free_ini_search_path = 0;
+ zend_file_handle fh;
-
-- /* If still no ini file found, search for php.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);
-- if (fh.handle.fp) {
-- fh.filename = php_ini_opened_path;
-- }
-- }
++ static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
++
+ if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
config_zval_dtor, 1) == FAILURE) {
+ return FAILURE;
}
+@@ -372,7 +373,6 @@
+ char *default_location;
+ char *env_location;
+ char *binary_location;
+- static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0
};
+ #ifdef PHP_WIN32
+ char *reg_location;
+ #endif
+@@ -608,72 +608,83 @@
- if (free_ini_search_path) {
-@@ -533,9 +543,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);
+- struct dirent **namelist;
+ int ndir, i;
+ struct stat sb;
+ char ini_file[MAXPATHLEN];
+- char *p;
++ char *p, *last, *path_copy, *ini_path = NULL;
+ zend_file_handle fh;
+ zend_llist scanned_ini_list;
+ zend_llist_element *element;
+ int l, total_l = 0;
- 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"))) {
-@@ -556,6 +570,35 @@
- /* 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);
-+ }
+- /* Reset active ini section */
+- RESET_ACTIVE_INI_HASH();
+-
+- if ((ndir = php_scandir(php_ini_scanned_path, &namelist, 0,
php_alphasort)) > 0) {
+- zend_llist_init(&scanned_ini_list, sizeof(char *),
(llist_dtor_func_t) free_estring, 1);
+- memset(&fh, 0, sizeof(fh));
+-
+- for (i = 0; i < ndir; i++) {
+-
+- /* check for any file with .ini extension */
+- if (!(p = strrchr(namelist[i]->d_name, '.')) ||
(p && strcmp(p, ".ini"))) {
+- free(namelist[i]);
+- continue;
+- }
+- if
(IS_SLASH(php_ini_scanned_path[php_ini_scanned_path_len - 1])) {
+- snprintf(ini_file, MAXPATHLEN, "%s%s",
php_ini_scanned_path, namelist[i]->d_name);
+- } else {
+- snprintf(ini_file, MAXPATHLEN,
"%s%c%s", php_ini_scanned_path, 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;
+-
+- if
(zend_parse_ini_file(&fh, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)
php_ini_parser_cb, &configuration_hash TSRMLS_CC) == SUCCESS) {
+- /* 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);
++ /* 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);
++ ini_path = php_strtok_r(path_copy, paths_separator, &last);
+
-+ if ((ndir = php_scandir(sapi_scan_dir, &namelist, 0,
php_alphasort)) > 0) {
-+ found += ndir;
++ while (ini_path != NULL) {
++ struct dirent **namelist;
++ int ini_path_len = strlen(ini_path);
+
-+ 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);
++ if ((ndir = php_scandir(ini_path, &namelist, 0,
php_alphasort)) > 0) {
++ memset(&fh, 0, sizeof(fh));
++
++ for (i = 0; i < ndir; i++) {
++ /* check for any file with .ini
extension */
++ if (!(p = strrchr(namelist[i]->d_name,
'.')) || (p && strcmp(p, ".ini"))) {
++ free(namelist[i]);
++ continue;
++ }
++ if (IS_SLASH(ini_path[ini_path_len -
1])) {
++ snprintf(ini_file, MAXPATHLEN,
"%s%s", ini_path, namelist[i]->d_name);
++ } else {
++ snprintf(ini_file, MAXPATHLEN,
"%s%c%s", ini_path, 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;
++
++ /* Reset active
ini section */
++
RESET_ACTIVE_INI_HASH();
++
++ if
(zend_parse_ini_file(&fh, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)
php_ini_parser_cb, &configuration_hash TSRMLS_CC) == SUCCESS) {
++ /*
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);
++ }
+ }
}
-@@ -564,8 +607,11 @@
- free(namelist[i]);
+ }
++ free(namelist[i]);
+ }
+- free(namelist[i]);
++ free(namelist);
}
- free(namelist);
+- free(namelist);
+-
+- if (total_l) {
+- int php_ini_scanned_files_len =
(php_ini_scanned_files) ? strlen(php_ini_scanned_files) + 1 : 0;
+- php_ini_scanned_files = (char *)
realloc(php_ini_scanned_files, php_ini_scanned_files_len + total_l + 1);
+- if (!php_ini_scanned_files_len) {
+- *php_ini_scanned_files = '\0';
+- }
+- total_l += php_ini_scanned_files_len;
+- for (element = scanned_ini_list.head; element;
element = element->next) {
+- if (php_ini_scanned_files_len) {
+- strlcat(php_ini_scanned_files,
",\n", total_l);
+- }
+- strlcat(php_ini_scanned_files, *(char
**)element->data, total_l);
+- strlcat(php_ini_scanned_files,
element->next ? ",\n" : "\n", total_l);
++ ini_path = php_strtok_r(NULL, paths_separator, &last);
+ }
-+ efree(sapi_scan_dir);
-
-- /*
-+ if (found) {
-+ /*
- * Don't need an extra byte for the \0 in this malloc
as the last
- * element will not get a trailing , which gives us the
byte for the \0
- */
++
++ if (total_l) {
++ int php_ini_scanned_files_len = (php_ini_scanned_files)
? strlen(php_ini_scanned_files) + 1 : 0;
++ php_ini_scanned_files = (char *)
realloc(php_ini_scanned_files, php_ini_scanned_files_len + total_l + 1);
++ if (!php_ini_scanned_files_len) {
++ *php_ini_scanned_files = '\0';
++ }
++ total_l += php_ini_scanned_files_len;
++ for (element = scanned_ini_list.head; element; element
= element->next) {
++ if (php_ini_scanned_files_len) {
++ strlcat(php_ini_scanned_files, ",\n",
total_l);
+ }
++ strlcat(php_ini_scanned_files, *(char
**)element->data, total_l);
++ strlcat(php_ini_scanned_files, element->next ?
",\n" : "\n", total_l);
+ }
+- zend_llist_destroy(&scanned_ini_list);
+ }
++ efree(path_copy);
++ zend_llist_destroy(&scanned_ini_list);
+ } else {
+ /* Make sure an empty php_ini_scanned_path ends up as NULL */
+ php_ini_scanned_path = NULL;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-sapi-ini-file.patch?r1=1.9&r2=1.9.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
