From 33131298f3fec4e64761d8bae44a4d72eedf159a Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Mon, 26 Mar 2007 11:19:37 +0000 Subject: [PATCH] revert by request of Derick --- NEWS | 1 - main/php_variables.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/NEWS b/NEWS index dd7eeff11a..3f01aedff1 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,6 @@ PHP 4 NEWS handle). (Tony) - Fixed bug #40747 (possible crash in session when save_path is out of open_basedir). (Tony) -- Fixed bug #40586 (_ENV vars get escaped when magic_quotes_gpc is on). (Tony) - Fixed MOPB-8, XSS in phpinfo() (Joe Orton, Stas) - Fixed unallocated memory access/double free in in array_user_key_compare() (MOPB-24 by Stefan Esser) (Stas) diff --git a/main/php_variables.c b/main/php_variables.c index aec0869643..92ac036a1b 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -351,8 +351,6 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) void _php_import_environment_variables(zval *array_ptr TSRMLS_DC) { char **env, *p, *t; - int magic_quotes_gpc = PG(magic_quotes_gpc); - PG(magic_quotes_gpc) = 0; for (env = environ; env != NULL && *env != NULL; env++) { p = strchr(*env, '='); @@ -363,7 +361,6 @@ void _php_import_environment_variables(zval *array_ptr TSRMLS_DC) php_register_variable(t, p+1, array_ptr TSRMLS_CC); efree(t); } - PG(magic_quotes_gpc) = magic_quotes_gpc; } -- 2.40.0