cvs: php4 /ext/standard string.c
| From: | Stanislav Malyshev | Date: | Tue, 12 Sep 2000 10:54:45 +0000 |
| Subject: | cvs: php4 /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1727@lists.php.net to get a copy of this message | ||
stas Tue Sep 12 03:54:45 2000 EDT
Modified files:
/php4/ext/standard string.c
Log:
A quick attempt to make parse_str($str,$arr) not register globals.
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.153 php4/ext/standard/string.c:1.154
--- php4/ext/standard/string.c:1.153 Mon Sep 11 13:06:24 2000
+++ php4/ext/standard/string.c Tue Sep 12 03:54:45 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.153 2000/09/11 20:06:24 derick Exp $ */
+/* $Id: string.c,v 1.154 2000/09/12 10:54:45 stas Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2442,11 +2442,14 @@
php_treat_data(PARSE_STRING, res, NULL ELS_CC PLS_CC SLS_CC);
else
{
+ int old_rg = PG(register_globals);
+ PG(register_globals) = 0;
/* Clear out the array that was passed in. */
zval_dtor(*arrayArg);
array_init(*arrayArg);
php_treat_data(PARSE_STRING, res, *arrayArg ELS_CC PLS_CC SLS_CC);
+ PG(register_globals) = old_rg;
}
}
/* }}} */