diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-01-04 13:45:11 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-01-04 13:45:11 +0800 |
| commit | 4a4602c45c8dcd70538de3ebbe5c6829e5ca6fcf (patch) | |
| tree | 3725689ea9e318ee1fc5ef34a6a83f62bc943802 /ext/zip/lib/zip_set_file_compression.c | |
| parent | 76d0e3d514ba47ad29c06e97efc16fef41e8186b (diff) | |
| parent | 0e3dede07c6677ed5cc60ddad3f7552f83b45a4b (diff) | |
| download | php-git-4a4602c45c8dcd70538de3ebbe5c6829e5ca6fcf.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Happy new year (Update copyright to 2018)
Happy new year (Update copyright to 2018)
Revert "Enable ODBC tests on AppVeyor"
Enable ODBC tests on AppVeyor
Skip on Travis-CI
Extend skip section
2018
missing changelog entries + fix version and date
missing changelog entries
2018
Trailing whitespaces
Diffstat (limited to 'ext/zip/lib/zip_set_file_compression.c')
| -rw-r--r-- | ext/zip/lib/zip_set_file_compression.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/zip/lib/zip_set_file_compression.c b/ext/zip/lib/zip_set_file_compression.c index 7bb0bf9450..54b3867fac 100644 --- a/ext/zip/lib/zip_set_file_compression.c +++ b/ext/zip/lib/zip_set_file_compression.c @@ -17,7 +17,7 @@ 3. The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -57,11 +57,11 @@ zip_set_file_compression(zip_t *za, zip_uint64_t idx, zip_int32_t method, zip_ui } e = za->entry+idx; - + old_method = (e->orig == NULL ? ZIP_CM_DEFAULT : e->orig->comp_method); - + /* TODO: revisit this when flags are supported, since they may require a recompression */ - + if (method == old_method) { if (e->changes) { e->changes->changed &= ~ZIP_DIRENT_COMP_METHOD; @@ -82,6 +82,6 @@ zip_set_file_compression(zip_t *za, zip_uint64_t idx, zip_int32_t method, zip_ui e->changes->comp_method = method; e->changes->changed |= ZIP_DIRENT_COMP_METHOD; } - + return 0; } |