| Antony Dovgal 2007-06-08, 6:57 pm |
| tony2001 Fri Jun 8 14:47:45 2007 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_ini.c
Log:
MFH: fix #41561 (Values set with php_admin_* in httpd.conf can be overwritten with ini_set())
http://cvs.php.net/viewvc.cgi/ZendE...9&diff_format=u
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.39.2.2.2.8 ZendEngine2/zend_ini.c:1.39.2.2.2.9
--- ZendEngine2/zend_ini.c:1.39.2.2.2.8 Mon Apr 16 08:09:54 2007
+++ ZendEngine2/zend_ini.c Fri Jun 8 14:47:45 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini.c,v 1.39.2.2.2.8 2007/04/16 08:09:54 dmitry Exp $ */
+/* $Id: zend_ini.c,v 1.39.2.2.2.9 2007/06/08 14:47:45 tony2001 Exp $ */
#include "zend.h"
#include "zend_qsort.h"
@@ -244,6 +244,10 @@
return FAILURE;
}
+ if (stage == ZEND_INI_STAGE_ACTIVATE && modify_type == ZEND_INI_SYSTEM) {
+ ini_entry->modifiable = ZEND_INI_SYSTEM;
+ }
+
duplicate = estrndup(new_value, new_value_length);
if (!ini_entry->on_modify
|