cvs: ZendEngine2(PHP_5_2) / zend_ini.c
| From: | Antony Dovgal | Date: | Thu, 23 Aug 2007 18:42:42 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_2) / zend_ini.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-5968@lists.php.net to get a copy of this message | ||
tony2001 Thu Aug 23 18:42:42 2007 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_ini.c
Log:
MFH: revert the patch which breaks multithreaded servers
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.c?r1=1.39.2.2.2.10&r2=1.39.2.2.2.11&diff_format=u
Index: ZendEngine2/zend_ini.c
diff -u ZendEngine2/zend_ini.c:1.39.2.2.2.10 ZendEngine2/zend_ini.c:1.39.2.2.2.11
--- ZendEngine2/zend_ini.c:1.39.2.2.2.10 Sun Jun 17 14:31:12 2007
+++ ZendEngine2/zend_ini.c Thu Aug 23 18:42:42 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini.c,v 1.39.2.2.2.10 2007/06/17 14:31:12 iliaa Exp $ */
+/* $Id: zend_ini.c,v 1.39.2.2.2.11 2007/08/23 18:42:42 tony2001 Exp $ */
#include "zend.h"
#include "zend_qsort.h"
@@ -243,10 +243,6 @@
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;
}