com php-src: Fixed bug #71063 (filter_input(INPUT_ENV , ..) does not work): ext/filter/filter .c ext/filter/tests/bug71063.phpt
| From: | Reeze Xia | Date: | Tue, 08 Dec 2015 16:04:12 +0000 |
| Subject: | com php-src: Fixed bug #71063 (filter_input(INPUT_ENV , ..) does not work): ext/filter/filter .c ext/filter/tests/bug71063.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90136@lists.php.net to get a copy of this message | ||
Commit: 3427c122bf02488559ef5fdf0e9403396c30a5f1
Author: Reeze Xia <reeze@php.net> Wed, 9 Dec 2015 00:02:00 +0800
Parents: e26b605c2184c4ae29c3cdfaaf5bc7b2cb297988
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3427c122bf02488559ef5fdf0e9403396c30a5f1
Log:
Fixed bug #71063 (filter_input(INPUT_ENV, ..) does not work)
Bugs:
https://bugs.php.net/71063
Changed paths:
M ext/filter/filter.c
A ext/filter/tests/bug71063.phpt
Diff:
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index e29a36a..581fc9c 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -546,7 +546,7 @@ static zval *php_filter_get_storage(zend_long arg)/* {{{ */
if (PG(auto_globals_jit)) {
zend_is_auto_global_str(ZEND_STRL("_ENV"));
}
- array_ptr = &IF_G(env_array) ? &IF_G(env_array) : &PG(http_globals)[TRACK_VARS_ENV];
+ array_ptr = !Z_ISUNDEF(IF_G(env_array)) ? &IF_G(env_array) :
&PG(http_globals)[TRACK_VARS_ENV];
break;
case PARSE_SESSION:
/* FIXME: Implement session source */
diff --git a/ext/filter/tests/bug71063.phpt b/ext/filter/tests/bug71063.phpt
new file mode 100644
index 0000000..36807aac
--- /dev/null
+++ b/ext/filter/tests/bug71063.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #71063 filter_input(INPUT_ENV, ..) does not work
+--SKIPIF--
+<?php if (!extension_loaded("filter")) die("skip"); ?>
+--FILE--
+<?php
+var_dump(count($_ENV['PATH']) > 0);
+var_dump(count(filter_input(INPUT_ENV, 'PATH')) > 0);
+?>
+--EXPECT--
+bool(true)
+bool(true)
\ No newline at end of file