summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/filter/filter.c2
-rw-r--r--ext/filter/filter_private.h1
-rw-r--r--ext/filter/php_filter.h1
-rw-r--r--ext/filter/sanitizing_filters.c14
-rw-r--r--ext/filter/tests/008.phpt6
-rw-r--r--ext/filter/tests/020.phpt27
-rw-r--r--ext/filter/tests/033.phpt21
7 files changed, 2 insertions, 70 deletions
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 5ea4a086f1..23ef0bdf9b 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -57,7 +57,6 @@ static const filter_list_entry filter_list[] = {
{ "url", FILTER_SANITIZE_URL, php_filter_url },
{ "number_int", FILTER_SANITIZE_NUMBER_INT, php_filter_number_int },
{ "number_float", FILTER_SANITIZE_NUMBER_FLOAT, php_filter_number_float },
- { "magic_quotes", FILTER_SANITIZE_MAGIC_QUOTES, php_filter_magic_quotes },
{ "add_slashes", FILTER_SANITIZE_ADD_SLASHES, php_filter_add_slashes },
{ "callback", FILTER_CALLBACK, php_filter_callback },
@@ -213,7 +212,6 @@ PHP_MINIT_FUNCTION(filter)
REGISTER_LONG_CONSTANT("FILTER_SANITIZE_URL", FILTER_SANITIZE_URL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILTER_SANITIZE_NUMBER_INT", FILTER_SANITIZE_NUMBER_INT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILTER_SANITIZE_NUMBER_FLOAT", FILTER_SANITIZE_NUMBER_FLOAT, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("FILTER_SANITIZE_MAGIC_QUOTES", FILTER_SANITIZE_MAGIC_QUOTES, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILTER_SANITIZE_ADD_SLASHES", FILTER_SANITIZE_ADD_SLASHES, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FILTER_CALLBACK", FILTER_CALLBACK, CONST_CS | CONST_PERSISTENT);
diff --git a/ext/filter/filter_private.h b/ext/filter/filter_private.h
index 3f2fd4a0f9..5dcbd5c3cc 100644
--- a/ext/filter/filter_private.h
+++ b/ext/filter/filter_private.h
@@ -79,7 +79,6 @@
#define FILTER_SANITIZE_URL 0x0206
#define FILTER_SANITIZE_NUMBER_INT 0x0207
#define FILTER_SANITIZE_NUMBER_FLOAT 0x0208
-#define FILTER_SANITIZE_MAGIC_QUOTES 0x0209
#define FILTER_SANITIZE_FULL_SPECIAL_CHARS 0x020a
#define FILTER_SANITIZE_ADD_SLASHES 0x020b
#define FILTER_SANITIZE_LAST 0x020b
diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h
index 1a544fe435..2a923ab953 100644
--- a/ext/filter/php_filter.h
+++ b/ext/filter/php_filter.h
@@ -90,7 +90,6 @@ void php_filter_url(PHP_INPUT_FILTER_PARAM_DECL);
void php_filter_number_int(PHP_INPUT_FILTER_PARAM_DECL);
void php_filter_number_float(PHP_INPUT_FILTER_PARAM_DECL);
void php_filter_add_slashes(PHP_INPUT_FILTER_PARAM_DECL);
-void php_filter_magic_quotes(PHP_INPUT_FILTER_PARAM_DECL);
void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL);
diff --git a/ext/filter/sanitizing_filters.c b/ext/filter/sanitizing_filters.c
index f12cec9c49..a39213d52f 100644
--- a/ext/filter/sanitizing_filters.c
+++ b/ext/filter/sanitizing_filters.c
@@ -373,17 +373,3 @@ void php_filter_add_slashes(PHP_INPUT_FILTER_PARAM_DECL)
ZVAL_STR(value, buf);
}
/* }}} */
-
-/* {{{ php_filter_magic_quotes */
-void php_filter_magic_quotes(PHP_INPUT_FILTER_PARAM_DECL)
-{
- zend_string *buf;
- php_error_docref(NULL, E_DEPRECATED,
- "FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead");
-
- buf = php_addslashes(Z_STR_P(value));
-
- zval_ptr_dtor(value);
- ZVAL_STR(value, buf);
-}
-/* }}} */
diff --git a/ext/filter/tests/008.phpt b/ext/filter/tests/008.phpt
index b34c977425..75e0968c62 100644
--- a/ext/filter/tests/008.phpt
+++ b/ext/filter/tests/008.phpt
@@ -10,7 +10,7 @@ var_dump(filter_list());
echo "Done\n";
?>
--EXPECTF--
-array(22) {
+array(21) {
[0]=>
string(3) "int"
[1]=>
@@ -50,10 +50,8 @@ array(22) {
[18]=>
string(12) "number_float"
[19]=>
- string(12) "magic_quotes"
- [20]=>
string(11) "add_slashes"
- [21]=>
+ [20]=>
string(8) "callback"
}
Done
diff --git a/ext/filter/tests/020.phpt b/ext/filter/tests/020.phpt
deleted file mode 100644
index 5c2ec5bfb2..0000000000
--- a/ext/filter/tests/020.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-filter_var() and FILTER_SANITIZE_MAGIC_QUOTES
---SKIPIF--
-<?php if (!extension_loaded("filter")) die("skip"); ?>
---FILE--
-<?php
-
-var_dump(filter_var("test'asd'asd'' asd\'\"asdfasdf", FILTER_SANITIZE_MAGIC_QUOTES));
-var_dump(filter_var("'", FILTER_SANITIZE_MAGIC_QUOTES));
-var_dump(filter_var("", FILTER_SANITIZE_MAGIC_QUOTES));
-var_dump(filter_var(-1, FILTER_SANITIZE_MAGIC_QUOTES));
-
-echo "Done\n";
-?>
---EXPECTF--
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-string(36) "test\'asd\'asd\'\' asd\\\'\"asdfasdf"
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-string(2) "\'"
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-string(0) ""
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-string(2) "-1"
-Done
diff --git a/ext/filter/tests/033.phpt b/ext/filter/tests/033.phpt
index 83ae4a3c19..0791a74de9 100644
--- a/ext/filter/tests/033.phpt
+++ b/ext/filter/tests/033.phpt
@@ -29,26 +29,5 @@ email PHP 1 foo@bar.com httpa.b.c 1.2.3.4 123 12
url PHP 1 foo@bar.com http://a.b.c 1.2.3.4 123 123abc<>() O'Henry aa:bb:cc:dd:ee:ff
number_int 1 1234 123 123
number_float 1 1234 123 123
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-
-Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
-magic_quotes PHP 1 foo@bar.com http://a.b.c 1.2.3.4 123 123abc<>() O\'Henry 하퍼 aa:bb:cc:dd:ee:ff
add_slashes PHP 1 foo@bar.com http://a.b.c 1.2.3.4 123 123abc<>() O\'Henry 하퍼 aa:bb:cc:dd:ee:ff
callback PHP 1 FOO@BAR.COM HTTP://A.B.C 1.2.3.4 123 123ABC<>() O'HENRY 하퍼 AA:BB:CC:DD:EE:FF
View Lorry Controller Status