jani Fri Aug 31 07:52:29 2007 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_ini.c
Log:
MFH: Revert revert.
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.c?r1=1.39.2.2.2.11&r2=1.39.2.2.2.12&diff_format=u
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.39.2.2.2.11
ZendEngine2/zend_ini.c:1.39.2.2.2.12
--- ZendEngine2/zend_ini.c:1.39.2.2.2.11 Thu Aug 23 18:42:42 2007
+++ ZendEngine2/zend_ini.c Fri Aug 31 07:52:29 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini.c,v 1.39.2.2.2.11 2007/08/23 18:42:42 tony2001 Exp $ */
+/* $Id: zend_ini.c,v 1.39.2.2.2.12 2007/08/31 07:52:29 jani Exp $ */
#include "zend.h"
#include "zend_qsort.h"
@@ -243,6 +243,10 @@
return FAILURE;
}
+ if (stage == ZEND_INI_STAGE_ACTIVATE && modify_type == ZEND_INI_SYSTEM)
{
+ ini_entry->modifiable = ZEND_INI_SYSTEM;
+ }
+
if (!(ini_entry->modifiable & modify_type)) {
return FAILURE;
}
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
