cvs: ZendEngine2 / zend_ini.c zend_ini.h

iliaa		Thu Mar 13 16:01:46 2008 UTC

  Modified files:              
    /ZendEngine2	zend_ini.c zend_ini.h 
  Log:
  
  MFB: MFB: Fixed bug #43677 (Inconsistent behaviour of include_path set with
  php_value).
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.c?r1=1.73&r2=1.74&diff_format=u
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.73 ZendEngine2/zend_ini.c:1.74
--- ZendEngine2/zend_ini.c:1.73	Tue Jan 15 17:10:25 2008
+++ ZendEngine2/zend_ini.c	Thu Mar 13 16:01:46 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ini.c,v 1.73 2008/01/15 17:10:25 tony2001 Exp $ */
+/* $Id: zend_ini.c,v 1.74 2008/03/13 16:01:46 iliaa Exp $ */
 
 #include "zend.h"
 #include "zend_qsort.h"
@@ -60,9 +60,11 @@
 		}
 		ini_entry->value = ini_entry->orig_value;
 		ini_entry->value_length = ini_entry->orig_value_length;
+		ini_entry->modifiable = ini_entry->orig_modifiable;
 		ini_entry->modified = 0;
 		ini_entry->orig_value = NULL;
 		ini_entry->orig_value_length = 0;
+		ini_entry->orig_modifiable = 0;
 	}
 	return 0;
 }
@@ -247,12 +249,16 @@
 {
 	zend_ini_entry *ini_entry;
 	char *duplicate;
+	zend_bool modifiable;
 	zend_bool modified;
 
 	if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry) == FAILURE) {
 		return FAILURE;
 	}
 
+	modifiable = ini_entry->modifiable;
+	modified = ini_entry->modified;
+
 	if (stage == ZEND_INI_STAGE_ACTIVATE && modify_type == ZEND_INI_SYSTEM) {
 		ini_entry->modifiable = ZEND_INI_SYSTEM;
 	}
@@ -263,8 +269,6 @@
 		}
 	}
 
-	modified = ini_entry->modified;
-
 	if (!EG(modified_ini_directives)) {
 		ALLOC_HASHTABLE(EG(modified_ini_directives));
 		zend_hash_init(EG(modified_ini_directives), 8, NULL, NULL, 0);
@@ -272,6 +276,7 @@
 	if (!modified) {
 		ini_entry->orig_value = ini_entry->value;
 		ini_entry->orig_value_length = ini_entry->value_length;
+		ini_entry->orig_modifiable = modifiable;
 		ini_entry->modified = 1;
 		zend_hash_add(EG(modified_ini_directives), name, name_length, &ini_entry, sizeof(zend_ini_entry*), NULL);
 	}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.h?r1=1.47&r2=1.48&diff_format=u
Index: ZendEngine2/zend_ini.h
diff -u ZendEngine2/zend_ini.h:1.47 ZendEngine2/zend_ini.h:1.48
--- ZendEngine2/zend_ini.h:1.47	Mon Dec 31 07:12:07 2007
+++ ZendEngine2/zend_ini.h	Thu Mar 13 16:01:46 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ini.h,v 1.47 2007/12/31 07:12:07 sebastian Exp $ */
+/* $Id: zend_ini.h,v 1.48 2008/03/13 16:01:46 iliaa Exp $ */
 
 #ifndef ZEND_INI_H
 #define ZEND_INI_H
@@ -77,6 +77,7 @@
 
 	char *orig_value;
 	uint orig_value_length;
+	int orig_modifiable;
 	int modified;
 
 	void (*displayer)(zend_ini_entry *ini_entry, int type);
@@ -112,10 +113,10 @@
 END_EXTERN_C()
 
 #define ZEND_INI_BEGIN()		static const zend_ini_entry ini_entries[] = {
-#define ZEND_INI_END()		{ 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, 0, 0, NULL } };
+#define ZEND_INI_END()		{ 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, 0, 0, 0, NULL } };
 
 #define ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, arg1, arg2, arg3, displayer) \
-	{ 0, modifiable, name, sizeof(name), on_modify, arg1, arg2, arg3, default_value, sizeof(default_value)-1, NULL, 0, 0, displayer },
+	{ 0, modifiable, name, sizeof(name), on_modify, arg1, arg2, arg3, default_value, sizeof(default_value)-1, NULL, 0, 0, 0, displayer },
 
 #define ZEND_INI_ENTRY3(name, default_value, modifiable, on_modify, arg1, arg2, arg3) \
 	ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, arg1, arg2, arg3, NULL)