diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-04-23 21:59:50 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-04-23 21:59:57 -0700 |
| commit | 5a18d7a0df075eb49a4e8094d1d54fed937f7565 (patch) | |
| tree | ef5fe59368fb083683ed72064e2fd4ca7df4cb52 /ext/phar/tests/zip | |
| parent | 01f42b836c49bc57ae69b65bde35461a9f136796 (diff) | |
| parent | ee76a5ae5ad57bb9d0bc183bcbf9c4652331c2e3 (diff) | |
| download | php-git-5a18d7a0df075eb49a4e8094d1d54fed937f7565.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Diffstat (limited to 'ext/phar/tests/zip')
| -rw-r--r-- | ext/phar/tests/zip/frontcontroller10.phar.phpt | 2 | ||||
| -rw-r--r-- | ext/phar/tests/zip/frontcontroller6.phar.phpt | 2 | ||||
| -rw-r--r-- | ext/phar/tests/zip/frontcontroller8.phar.phpt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/phar/tests/zip/frontcontroller10.phar.phpt b/ext/phar/tests/zip/frontcontroller10.phar.phpt index 56d16c2064..5bbe9e1aff 100644 --- a/ext/phar/tests/zip/frontcontroller10.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller10.phar.phpt @@ -19,6 +19,6 @@ Status: 403 Access Denied <title>Access Denied</title> </head> <body> - <h1>403 - File /hi Access Denied</h1> + <h1>403 - File Access Denied</h1> </body> </html>
\ No newline at end of file diff --git a/ext/phar/tests/zip/frontcontroller6.phar.phpt b/ext/phar/tests/zip/frontcontroller6.phar.phpt index 15489f6ca7..63f7c62e88 100644 --- a/ext/phar/tests/zip/frontcontroller6.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller6.phar.phpt @@ -17,6 +17,6 @@ Status: 404 Not Found <title>File Not Found</title> </head> <body> - <h1>404 - File /notfound.php Not Found</h1> + <h1>404 - File Not Found</h1> </body> </html>
\ No newline at end of file diff --git a/ext/phar/tests/zip/frontcontroller8.phar.phpt b/ext/phar/tests/zip/frontcontroller8.phar.phpt index 1b0d133bc7..d4c3a3f9ea 100644 --- a/ext/phar/tests/zip/frontcontroller8.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller8.phar.phpt @@ -16,6 +16,6 @@ Status: 404 Not Found <title>File Not Found</title> </head> <body> - <h1>404 - File /index.php Not Found</h1> + <h1>404 - File Not Found</h1> </body> </html>
\ No newline at end of file |