diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-02-12 06:43:05 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-02-12 06:43:05 +0100 |
| commit | 99bd2fd9c40b8766a73562297592a475a0b78023 (patch) | |
| tree | d465ccbc464c2768825700edc4d48b67dee09f9a /ext/zip/php_zip.h | |
| parent | 1f148f7ad99e78476ff20ef47c09082ae2861bc4 (diff) | |
| parent | 06bbfe1e2a46d6c2eaf74b7c576b09114ee2e670 (diff) | |
| download | php-git-99bd2fd9c40b8766a73562297592a475a0b78023.tar.gz | |
Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (97 commits)
update the alpha2 release date
Fixed ZTS and added fix to NEWS.
Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too.
Rename timelib_get_zone to timelib_parse_zone and export.
fix regex to detect valgrind version New PCRE version got stricter
fix regex to detect valgrind version New PCRE version got stricter
Fixed memory leak in pow operator
5.5.9 now released
Added information in NEWS and UPGRADING
add T_POW (**) operator
add NEWS block for 5.6.0alpha3
updated libs_version.txt
updated libs_version.txt
update libs_version.txt
more tests for ICU >= 52.1 compat
fix tests for ICU >= 52.1
Fix year
adapt test to curl 7.35.0 upgrade
move the NEWS entry into the right section
Fixed SNI failure from missing Z_STRVAL_PP
...
Diffstat (limited to 'ext/zip/php_zip.h')
| -rw-r--r-- | ext/zip/php_zip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 591b907aa8..ffe4530415 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -38,7 +38,7 @@ extern zend_module_entry zip_module_entry; #define ZIP_OVERWRITE ZIP_TRUNCATE #endif -#define PHP_ZIP_VERSION "1.12.4-dev" +#define PHP_ZIP_VERSION "1.12.4" #if ((PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION >= 6) # define PHP_ZIP_USE_OO 1 |