Author: arekm Date: Sun Dec 12 20:09:07 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated
---- Files affected:
packages/php:
php-config-file-scan-dir.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/php/php-config-file-scan-dir.patch
diff -u packages/php/php-config-file-scan-dir.patch:1.2
packages/php/php-config-file-scan-dir.patch:1.3
--- packages/php/php-config-file-scan-dir.patch:1.2 Mon Jul 6 17:50:40 2009
+++ packages/php/php-config-file-scan-dir.patch Sun Dec 12 21:09:02 2010
@@ -17,8 +17,8 @@
- static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0
};
#ifdef PHP_WIN32
char *reg_location;
- #endif
-@@ -608,72 +608,83 @@
+ char phprc_path[MAXPATHLEN];
+@@ -608,72 +608,86 @@
/* 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) {
@@ -33,9 +33,6 @@
zend_llist_element *element;
int l, total_l = 0;
-- /* 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));
@@ -47,6 +44,9 @@
- free(namelist[i]);
- continue;
- }
+- /* Reset active ini section */
+- RESET_ACTIVE_INI_HASH();
+-
- 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 {
@@ -84,6 +84,9 @@
+ free(namelist[i]);
+ continue;
+ }
++ /* Reset active ini section */
++ RESET_ACTIVE_INI_HASH();
++
+ if (IS_SLASH(ini_path[ini_path_len -
1])) {
+ snprintf(ini_file, MAXPATHLEN,
"%s%s", ini_path, namelist[i]->d_name);
+ } else {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-config-file-scan-dir.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
