diff options
| author | Adam Harvey <aharvey@php.net> | 2011-01-28 04:19:40 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2011-01-28 04:19:40 +0000 |
| commit | d56de24ce7665ed70ffca2f2d1ed197a16a3ab3c (patch) | |
| tree | 2be6e5c2771071151462d41cf9a3b792adf2d110 | |
| parent | 0393cf77fc546e35a77cbf9d286e51d3afdbe5ef (diff) | |
| download | php-git-d56de24ce7665ed70ffca2f2d1ed197a16a3ab3c.tar.gz | |
Fixed bug #53854 (Missing constants for compression type). Patch by Richard
Quadling.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/zip/php_zip.c | 6 | ||||
| -rw-r--r-- | ext/zip/tests/bug53854.phpt | 44 |
3 files changed, 51 insertions, 0 deletions
@@ -146,6 +146,7 @@ gmail dot com, Gustavo) . Fixed bug #53166 (Missing parameters in docs and reflection definition). (Richard) + . Fixed bug #53854 (Missing constants for compression type). (Richard, Adam) 06 Jan 2011, PHP 5.3.5 - Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott, diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 6d3240f1d5..f46a1475dc 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -2754,6 +2754,12 @@ static PHP_MINIT_FUNCTION(zip) REGISTER_ZIP_CLASS_CONST_LONG("CM_DEFLATE", ZIP_CM_DEFLATE); REGISTER_ZIP_CLASS_CONST_LONG("CM_DEFLATE64", ZIP_CM_DEFLATE64); REGISTER_ZIP_CLASS_CONST_LONG("CM_PKWARE_IMPLODE", ZIP_CM_PKWARE_IMPLODE); + REGISTER_ZIP_CLASS_CONST_LONG("CM_BZIP2", ZIP_CM_BZIP2); + REGISTER_ZIP_CLASS_CONST_LONG("CM_LZMA", ZIP_CM_LZMA); + REGISTER_ZIP_CLASS_CONST_LONG("CM_TERSE", ZIP_CM_TERSE); + REGISTER_ZIP_CLASS_CONST_LONG("CM_LZ77", ZIP_CM_LZ77); + REGISTER_ZIP_CLASS_CONST_LONG("CM_WAVPACK", ZIP_CM_WAVPACK); + REGISTER_ZIP_CLASS_CONST_LONG("CM_PPMD", ZIP_CM_PPMD); /* Error code */ REGISTER_ZIP_CLASS_CONST_LONG("ER_OK", ZIP_ER_OK); /* N No error */ diff --git a/ext/zip/tests/bug53854.phpt b/ext/zip/tests/bug53854.phpt new file mode 100644 index 0000000000..cd8ae7e5f3 --- /dev/null +++ b/ext/zip/tests/bug53854.phpt @@ -0,0 +1,44 @@ +--TEST-- +Bug #53854 (Missing constants for compression type) +--SKIPIF-- +<?php +if(!extension_loaded('zip')) die('skip'); +?> +--FILE-- +<?php + +var_dump(ZipArchive::CM_DEFAULT); +var_dump(ZipArchive::CM_STORE); +var_dump(ZipArchive::CM_SHRINK); +var_dump(ZipArchive::CM_REDUCE_1); +var_dump(ZipArchive::CM_REDUCE_2); +var_dump(ZipArchive::CM_REDUCE_3); +var_dump(ZipArchive::CM_REDUCE_4); +var_dump(ZipArchive::CM_IMPLODE); +var_dump(ZipArchive::CM_DEFLATE); +var_dump(ZipArchive::CM_DEFLATE64); +var_dump(ZipArchive::CM_PKWARE_IMPLODE); +var_dump(ZipArchive::CM_BZIP2); +var_dump(ZipArchive::CM_LZMA); +var_dump(ZipArchive::CM_TERSE); +var_dump(ZipArchive::CM_LZ77); +var_dump(ZipArchive::CM_WAVPACK); +var_dump(ZipArchive::CM_PPMD); +--EXPECT-- +int(-1) +int(0) +int(1) +int(2) +int(3) +int(4) +int(5) +int(6) +int(8) +int(9) +int(10) +int(12) +int(14) +int(18) +int(19) +int(97) +int(98) |