Author: seanius
Date: 2007-04-22 17:06:25 +0000 (Sun, 22 Apr 2007)
New Revision: 5702
Added:
data/patches/MOPB/MOPB-26-php5.diff
Log:
mopb 26 for php5
Added: data/patches/MOPB/MOPB-26-php5.diff
==================================================================---
data/patches/MOPB/MOPB-26-php5.diff 2007-04-22 16:47:04 UTC (rev 5701)
+++ data/patches/MOPB/MOPB-26-php5.diff 2007-04-22 17:06:25 UTC (rev 5702)
@@ -0,0 +1,34 @@
+--- mb_gpc.c 2007/01/01 09:36:02 1.17.2.2.2.2
++++ mb_gpc.c 2007/03/18 16:36:13 1.17.2.2.2.3
+@@ -17,7 +17,7 @@
+ +----------------------------------------------------------------------+
+ */
+
+-/* $Id: mb_gpc.c,v 1.17.2.2.2.2 2007/01/01 09:36:02 sebastian Exp $ */
++/* $Id: mb_gpc.c,v 1.17.2.2.2.3 2007/03/18 16:36:13 iliaa Exp $ */
+
+ /* {{{ includes */
+ #ifdef HAVE_CONFIG_H
+@@ -208,9 +208,8 @@
+ /* register_globals stuff
+ * XXX: this feature is going to be deprecated? */
+
+- if (info->force_register_globals) {
+- prev_rg_state = PG(register_globals);
+- PG(register_globals) = 1;
++ if (info->force_register_globals && !(prev_rg_state =
PG(register_globals))) {
++ zend_alter_ini_entry("register_globals",
sizeof("register_globals"), "1", sizeof("1")-1,
PHP_INI_PERDIR, PHP_INI_STAGE_RUNTIME);
+ }
+
+ if (!res || *res == ''\0'') {
+@@ -343,8 +342,8 @@
+
+ out:
+ /* register_global stuff */
+- if (info->force_register_globals) {
+- PG(register_globals) = prev_rg_state;
++ if (info->force_register_globals && !prev_rg_state) {
++ zend_alter_ini_entry("register_globals",
sizeof("register_globals"), "0", sizeof("0")-1,
PHP_INI_PERDIR, PHP_INI_STAGE_RUNTIME);
+ }
+
+ if (convd != NULL) {