summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2006-12-07 11:00:08 +0000
committerAntony Dovgal <tony2001@php.net>2006-12-07 11:00:08 +0000
commit6b8526efce0faaf440b07a92ff74e24556772b61 (patch)
tree96423f5410f25fd61711e9f5c73680677e7d3c63
parent72ea6912f7408eee9172482fb2a21fe35a21a0e8 (diff)
downloadphp-git-6b8526efce0faaf440b07a92ff74e24556772b61.tar.gz
MFH: fix #39763 (magic quotes are applied twice by ext/filter)
-rw-r--r--NEWS1
-rw-r--r--ext/filter/filter.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 6afddf16bc..bcc23235d3 100644
--- a/NEWS
+++ b/NEWS
@@ -49,6 +49,7 @@ PHP NEWS
- Fixed FastCGI impersonation for persistent connections on Windows. (Dmitry)
- Fixed wrong signature initialization in imagepng (Takeshi Abe)
- Added optimization for imageline with horizontal and vertial lines (Pierre)
+- Fixed bug #39763 (magic quotes are applied twice by ext/filter). (Tony)
- Fixed bug #39754 (Some POSIX extension functions not thread safe).
(Ilia, wharmby at uk dot ibm dot com)
- Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension).
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 1b87db2e2d..3e3082436e 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -397,8 +397,6 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int
Z_STRVAL(new_var) = estrndup(*val, val_len);
INIT_PZVAL(tmp_new_var);
php_zval_filter(&tmp_new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL/*charset*/, 0 TSRMLS_CC);
- } else if (PG(magic_quotes_gpc)) {
- Z_STRVAL(new_var) = php_addslashes(*val, Z_STRLEN(new_var), &Z_STRLEN(new_var), 0 TSRMLS_CC);
} else {
Z_STRVAL(new_var) = estrndup(*val, val_len);
}