packages: php/php-sapi-ini-file.patch - moved from DEVEL

[arekm]

Author: arekm                        Date: Mon Jul  6 19:37:56 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved from DEVEL

---- Files affected:
packages/php:
   php-sapi-ini-file.patch (1.9 -> 1.10) 

---- 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.10
--- 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 21:37:51 2009
@@ -1,106 +1,18 @@
---- 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;
-+			}
-+		}
+--- php-5.3.0/main/php_ini.c.org	2009-07-06 17:32:30.309904482 +0200
++++ php-5.3.0/main/php_ini.c	2009-07-06 17:36:45.529879052 +0200
+@@ -620,12 +620,14 @@
+ 		zend_llist scanned_ini_list;
+ 		zend_llist_element *element;
+ 		int l, total_l = 0;
++		const char *fmt = "%s:" PHP_CONFIG_FILE_PATH "/%s.d";
  
- 		/* 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;
- 			}
- 		}
--
--		/* 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;
--			}
--		}
- 	}
+ 		/* 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);
++		path_copy = emalloc(strlen(php_ini_scanned_path) + strlen(fmt) + strlen(sapi_module.name));
++		sprintf(path_copy, fmt, php_ini_scanned_path, sapi_module.name);
+ 		ini_path  = php_strtok_r(path_copy, paths_separator, &last);
  
- 	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);
- 
- 		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);
-+		}
-+
-+		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);
- 						}
-@@ -564,8 +607,11 @@
- 				free(namelist[i]);
- 			}
- 			free(namelist);
-+		}
-+		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
- 			 */
+ 		while (ini_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.10&f=u