Skip to content

Commit

Permalink
Remove set_magic_quotes_runtime
Browse files Browse the repository at this point in the history
And the alias magic_quotes_runtime
  • Loading branch information
nikic committed Jan 17, 2015
1 parent 4c115b6 commit a60efc5
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 111 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Expand Up @@ -49,7 +49,6 @@ UPGRADING.INTERNALS merge=NEWS
/ext/spl/tests/SplArray_fromArray.phpt -crlf
/ext/standard/tests/dir/scandir_variation3.phpt -crlf
/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt -crlf
/ext/standard/tests/general_functions/set_magic_quotes_runtime_error.phpt -crlf
/ext/standard/tests/strings/bug26817.phpt -crlf
/ext/standard/tests/strings/bug26973.phpt -crlf
/ext/standard/tests/strings/bug27457.phpt -crlf
Expand Down
2 changes: 2 additions & 0 deletions NEWS
Expand Up @@ -109,6 +109,8 @@
. Added intdiv() function. (Andrea)
. Improved precision of log() function for base 2 and 10. (Marc Bennewitz)
. Remove string category support in setlocale(). (Nikita)
. Remove set_magic_quotes_runtime() and its alias magic_quotes_runtime().
(Nikita)

- Streams:
. Fixed bug #68532 (convert.base64-encode omits padding bytes).
Expand Down
1 change: 1 addition & 0 deletions UPGRADING
Expand Up @@ -78,6 +78,7 @@ PHP X.Y UPGRADE NOTES
- Standard:
. Removed string category support in setlocale(). Use the LC_* constants
instead.
. Removed set_magic_quotes_runtime() and its alias magic_quotes_runtime().

========================================
2. New Features
Expand Down
23 changes: 0 additions & 23 deletions ext/standard/basic_functions.c
Expand Up @@ -607,10 +607,6 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_get_magic_quotes_runtime, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_set_magic_quotes_runtime, 0, 0, 1)
ZEND_ARG_INFO(0, new_setting)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(arginfo_constant, 0)
ZEND_ARG_INFO(0, const_name)
ZEND_END_ARG_INFO()
Expand Down Expand Up @@ -2937,8 +2933,6 @@ const zend_function_entry basic_functions[] = { /* {{{ */
PHP_FE(header_register_callback, arginfo_header_register_callback)
PHP_FE(get_cfg_var, arginfo_get_cfg_var)

PHP_DEP_FALIAS(magic_quotes_runtime, set_magic_quotes_runtime, arginfo_set_magic_quotes_runtime)
PHP_DEP_FE(set_magic_quotes_runtime, arginfo_set_magic_quotes_runtime)
PHP_FE(get_magic_quotes_gpc, arginfo_get_magic_quotes_gpc)
PHP_FE(get_magic_quotes_runtime, arginfo_get_magic_quotes_runtime)

Expand Down Expand Up @@ -4572,23 +4566,6 @@ PHP_FUNCTION(get_cfg_var)
}
/* }}} */

/* {{{ proto bool set_magic_quotes_runtime(int new_setting)
magic_quotes_runtime is not supported anymore */
PHP_FUNCTION(set_magic_quotes_runtime)
{
zend_bool new_setting;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "b", &new_setting) == FAILURE) {
return;
}

if (new_setting) {
php_error_docref(NULL, E_CORE_ERROR, "magic_quotes_runtime is not supported anymore");
}
RETURN_FALSE;
}
/* }}} */

/* {{{ proto int get_magic_quotes_runtime(void)
Get the current active configuration setting of magic_quotes_runtime */
PHP_FUNCTION(get_magic_quotes_runtime)
Expand Down
1 change: 0 additions & 1 deletion ext/standard/basic_functions.h
Expand Up @@ -76,7 +76,6 @@ PHP_FUNCTION(set_time_limit);
PHP_FUNCTION(header_register_callback);

PHP_FUNCTION(get_cfg_var);
PHP_FUNCTION(set_magic_quotes_runtime);
PHP_FUNCTION(get_magic_quotes_runtime);
PHP_FUNCTION(get_magic_quotes_gpc);

Expand Down

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions run-tests.php
Expand Up @@ -114,7 +114,6 @@

error_reporting(E_ALL);
if (PHP_MAJOR_VERSION < 6) {
ini_set('magic_quotes_runtime',0); // this would break tests by modifying EXPECT sections
if (ini_get('safe_mode')) {
echo <<< SAFE_MODE_WARNING
Expand Down Expand Up @@ -236,7 +235,6 @@ function verify_config()
'error_append_string=',
'auto_prepend_file=',
'auto_append_file=',
'magic_quotes_runtime=0',
'ignore_repeated_errors=0',
'precision=14',
'memory_limit=128M',
Expand Down
1 change: 0 additions & 1 deletion server-tests.php
Expand Up @@ -472,7 +472,6 @@ class testHarness {
'error_append_string'=>'',
'auto_prepend_file'=>'',
'auto_append_file'=>'',
'magic_quotes_runtime'=>'0',
);
public $env = array();
public $info_params = array();
Expand Down

0 comments on commit a60efc5

Please sign in to comment.