diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-11-17 15:59:35 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-11-17 15:59:35 +0300 |
| commit | 79d9c12bf91384b96e1cee1c166b294834c78b79 (patch) | |
| tree | 8c8679e2054033d0ee31e077364861398a17bbfd | |
| parent | 226b82b127125ab20c957e1bc07c6aef7b4bf226 (diff) | |
| parent | 3817a2e6d51233cdd8ab7970b14822afa661f95c (diff) | |
| download | php-git-79d9c12bf91384b96e1cee1c166b294834c78b79.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed test
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
| -rw-r--r-- | sapi/fpm/tests/022-cve-2016-5385.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/tests/022-cve-2016-5385.phpt b/sapi/fpm/tests/022-cve-2016-5385.phpt index 7f3e818f9b..feb9d12395 100644 --- a/sapi/fpm/tests/022-cve-2016-5385.phpt +++ b/sapi/fpm/tests/022-cve-2016-5385.phpt @@ -27,7 +27,7 @@ $code = <<<EOT <?php echo "Test Start\n"; var_dump( - \$_SERVER["HTTP_PROXY"], + @\$_SERVER["HTTP_PROXY"], \$_SERVER["HTTP_FOO"], getenv("HTTP_PROXY"), getenv("HTTP_FOO") |