diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:31:57 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-10 14:31:57 -0700 |
| commit | 8ac131503ddeee5b1de8225510f9d2927e903620 (patch) | |
| tree | f02250a3e6cb8712adc02d23eb2e1b0f5dd3b3fd /ext/zip | |
| parent | d7c943e2a1f54c445276fc77369918f33c4f6cce (diff) | |
| parent | 4427d1dcfdca5e5e4b7e1b1226cf4771cc82389f (diff) | |
| download | php-git-8ac131503ddeee5b1de8225510f9d2927e903620.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
Diffstat (limited to 'ext/zip')
| -rw-r--r-- | ext/zip/lib/zip_open.c | 2 | ||||
| -rw-r--r-- | ext/zip/tests/bug64342_0.phpt | 2 | ||||
| -rw-r--r-- | ext/zip/tests/bug64342_1.phpt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/zip/lib/zip_open.c b/ext/zip/lib/zip_open.c index 2f56881b0a..5ce1c1070a 100644 --- a/ext/zip/lib/zip_open.c +++ b/ext/zip/lib/zip_open.c @@ -348,7 +348,7 @@ _zip_checkcons(FILE *fp, struct zip_cdir *cd, struct zip_error *error) /* _zip_check_torrentzip: - check wether ZA has a valid TORRENTZIP comment, i.e. is torrentzipped */ + check whether ZA has a valid TORRENTZIP comment, i.e. is torrentzipped */ static void _zip_check_torrentzip(struct zip *za) diff --git a/ext/zip/tests/bug64342_0.phpt b/ext/zip/tests/bug64342_0.phpt index 066d3e6fc2..ea7afa8e0a 100644 --- a/ext/zip/tests/bug64342_0.phpt +++ b/ext/zip/tests/bug64342_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #64342 ZipArchive::addFile() has to check file existance (variation 1) +Bug #64342 ZipArchive::addFile() has to check file existence (variation 1) --SKIPIF-- <?php if(!extension_loaded('zip')) die('skip'); diff --git a/ext/zip/tests/bug64342_1.phpt b/ext/zip/tests/bug64342_1.phpt index 2b1357d12f..06b0b92cab 100644 --- a/ext/zip/tests/bug64342_1.phpt +++ b/ext/zip/tests/bug64342_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #64342 ZipArchive::addFile() has to check file existance (variation 2) +Bug #64342 ZipArchive::addFile() has to check file existence (variation 2) --SKIPIF-- <?php /* $Id$ */ |