Skip to content

Commit b95da3c

Browse files
kocsismatekocsismate
committed
Remove FILTER_SANITIZE_MAGIC_QUOTES filter
1 parent 29ef077 commit b95da3c

File tree

7 files changed

+2
-70
lines changed

7 files changed

+2
-70
lines changed

‎ext/filter/filter.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ static const filter_list_entry filter_list[] = {
5757
{ "url", FILTER_SANITIZE_URL, php_filter_url },
5858
{ "number_int", FILTER_SANITIZE_NUMBER_INT, php_filter_number_int },
5959
{ "number_float", FILTER_SANITIZE_NUMBER_FLOAT, php_filter_number_float },
60-
{ "magic_quotes", FILTER_SANITIZE_MAGIC_QUOTES, php_filter_magic_quotes },
6160
{ "add_slashes", FILTER_SANITIZE_ADD_SLASHES, php_filter_add_slashes },
6261

6362
{ "callback", FILTER_CALLBACK, php_filter_callback },
@@ -213,7 +212,6 @@ PHP_MINIT_FUNCTION(filter)
213212
REGISTER_LONG_CONSTANT("FILTER_SANITIZE_URL", FILTER_SANITIZE_URL, CONST_CS | CONST_PERSISTENT);
214213
REGISTER_LONG_CONSTANT("FILTER_SANITIZE_NUMBER_INT", FILTER_SANITIZE_NUMBER_INT, CONST_CS | CONST_PERSISTENT);
215214
REGISTER_LONG_CONSTANT("FILTER_SANITIZE_NUMBER_FLOAT", FILTER_SANITIZE_NUMBER_FLOAT, CONST_CS | CONST_PERSISTENT);
216-
REGISTER_LONG_CONSTANT("FILTER_SANITIZE_MAGIC_QUOTES", FILTER_SANITIZE_MAGIC_QUOTES, CONST_CS | CONST_PERSISTENT);
217215
REGISTER_LONG_CONSTANT("FILTER_SANITIZE_ADD_SLASHES", FILTER_SANITIZE_ADD_SLASHES, CONST_CS | CONST_PERSISTENT);
218216

219217
REGISTER_LONG_CONSTANT("FILTER_CALLBACK", FILTER_CALLBACK, CONST_CS | CONST_PERSISTENT);

‎ext/filter/filter_private.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
#define FILTER_SANITIZE_URL 0x0206
8080
#define FILTER_SANITIZE_NUMBER_INT 0x0207
8181
#define FILTER_SANITIZE_NUMBER_FLOAT 0x0208
82-
#define FILTER_SANITIZE_MAGIC_QUOTES 0x0209
8382
#define FILTER_SANITIZE_FULL_SPECIAL_CHARS 0x020a
8483
#define FILTER_SANITIZE_ADD_SLASHES 0x020b
8584
#define FILTER_SANITIZE_LAST 0x020b

‎ext/filter/php_filter.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ void php_filter_url(PHP_INPUT_FILTER_PARAM_DECL);
9090
void php_filter_number_int(PHP_INPUT_FILTER_PARAM_DECL);
9191
void php_filter_number_float(PHP_INPUT_FILTER_PARAM_DECL);
9292
void php_filter_add_slashes(PHP_INPUT_FILTER_PARAM_DECL);
93-
void php_filter_magic_quotes(PHP_INPUT_FILTER_PARAM_DECL);
9493

9594
void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL);
9695

‎ext/filter/sanitizing_filters.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -373,17 +373,3 @@ void php_filter_add_slashes(PHP_INPUT_FILTER_PARAM_DECL)
373373
ZVAL_STR(value, buf);
374374
}
375375
/* }}} */
376-
377-
/* {{{ php_filter_magic_quotes */
378-
void php_filter_magic_quotes(PHP_INPUT_FILTER_PARAM_DECL)
379-
{
380-
zend_string *buf;
381-
php_error_docref(NULL, E_DEPRECATED,
382-
"FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead");
383-
384-
buf = php_addslashes(Z_STR_P(value));
385-
386-
zval_ptr_dtor(value);
387-
ZVAL_STR(value, buf);
388-
}
389-
/* }}} */

‎ext/filter/tests/008.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var_dump(filter_list());
1010
echo "Done\n";
1111
?>
1212
--EXPECTF--
13-
array(22) {
13+
array(21) {
1414
[0]=>
1515
string(3) "int"
1616
[1]=>
@@ -50,10 +50,8 @@ array(22) {
5050
[18]=>
5151
string(12) "number_float"
5252
[19]=>
53-
string(12) "magic_quotes"
54-
[20]=>
5553
string(11) "add_slashes"
56-
[21]=>
54+
[20]=>
5755
string(8) "callback"
5856
}
5957
Done

‎ext/filter/tests/020.phpt

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎ext/filter/tests/033.phpt

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,5 @@ email PHP 1 [email protected] httpa.b.c 1.2.3.4 123 12
2929
url PHP 1 [email protected] http://a.b.c 1.2.3.4 123 123abc<>() O'Henry aa:bb:cc:dd:ee:ff
3030
number_int 1 1234 123 123
3131
number_float 1 1234 123 123
32-
33-
Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
34-
35-
Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
36-
37-
Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
38-
39-
Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
40-
41-
Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
42-
43-
Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
44-
45-
Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
46-
47-
Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
48-
49-
Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
50-
51-
Deprecated: filter_var(): FILTER_SANITIZE_MAGIC_QUOTES is deprecated, use FILTER_SANITIZE_ADD_SLASHES instead in %s on line %d
52-
magic_quotes PHP 1 [email protected] http://a.b.c 1.2.3.4 123 123abc<>() O\'Henry 하퍼 aa:bb:cc:dd:ee:ff
5332
add_slashes PHP 1 [email protected] http://a.b.c 1.2.3.4 123 123abc<>() O\'Henry 하퍼 aa:bb:cc:dd:ee:ff
5433
callback PHP 1 [email protected] HTTP://A.B.C 1.2.3.4 123 123ABC<>() O'HENRY 하퍼 AA:BB:CC:DD:EE:FF

0 commit comments

Comments
 (0)