svn: /php/php-src/trunk/ext/standard/ basic_functions.c
| From: | Dmitry Stogov | Date: | Mon, 05 Jul 2010 14:32:29 +0000 |
| Subject: | svn: /php/php-src/trunk/ext/standard/ basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63018@lists.php.net to get a copy of this message | ||
dmitry Mon, 05 Jul 2010 14:32:29 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301002
Log:
Use ZE API to modify/restore PG(magic_quotes_runtime). Removed overhead at request startup.
Changed paths:
U php/php-src/trunk/ext/standard/basic_functions.c
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.c 2010-07-05 12:03:08 UTC (rev 301001)
+++ php/php-src/trunk/ext/standard/basic_functions.c 2010-07-05 14:32:29 UTC (rev 301002)
@@ -3682,9 +3682,6 @@
PHP_RINIT(dir)(INIT_FUNC_ARGS_PASSTHRU);
PHP_RINIT(url_scanner_ex)(INIT_FUNC_ARGS_PASSTHRU);
- /* Reset magic_quotes_runtime */
- PG(magic_quotes_runtime) = INI_BOOL("magic_quotes_runtime");
-
/* Setup default context */
FG(default_context) = NULL;
@@ -4534,7 +4531,9 @@
return;
}
- PG(magic_quotes_runtime) = new_setting;
+ if (zend_alter_ini_entry_ex("magic_quotes_runtime",
sizeof("magic_quotes_runtime"), new_setting ? "1" : "0", 1,
PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC) == FAILURE) {
+ RETURN_FALSE;
+ }
RETURN_TRUE;
}
/* }}} */