diff options
| author | Andrey Hristov <andrey@php.net> | 2014-08-06 17:02:17 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-08-06 17:02:17 +0300 |
| commit | 637367fc738bdb0fbeb54e4a24701203422e93c1 (patch) | |
| tree | 20214821b3fdd497d3eebc1787044e28e37d355e | |
| parent | ce5efa7adc4637957e70a6f6641a38f484baee99 (diff) | |
| parent | 05baed522f4f7cdb5a38e199c7abf5c06bf9b948 (diff) | |
| download | php-git-637367fc738bdb0fbeb54e4a24701203422e93c1.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Conflicts:
NEWS
configure.in
main/php_version.h
| -rw-r--r-- | NEWS | 15 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | main/php_version.h | 6 |
3 files changed, 19 insertions, 4 deletions
@@ -1,14 +1,25 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? 2014, PHP 5.5.17 + + ?? ??? 2014, PHP 5.5.16 - COM: . Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas). +- Fileinfo: + . Fixed bug #67705 (extensive backtracking in rule regular expression). + (CVE-2014-3538) (Remi) + - FPM: . Fixed bug #67635 (php links to systemd libraries without using pkg-config). (pacho@gentoo.org, Remi) +- GD: + . Fixed bug #66901 (php-gd 'c_color' NULL pointer dereference). + (CVE-2014-2497) (Remi) + - Milter: . Fixed bug #67715 (php-milter does not build and crashes randomly). (Mike) @@ -31,6 +42,10 @@ PHP NEWS . Fixed bug #60616 (odbc_fetch_into returns junk data at end of multi-byte char fields). (Keyur) +- Zlib: + . Fixed bug #67724 (chained zlib filters silently fail with large amounts of + data). (Mike) + 24 Jul 2014, PHP 5.5.15 - Core: diff --git a/configure.in b/configure.in index 37310cdc6b..a6eb3a5faf 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=15 +PHP_RELEASE_VERSION=17 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index 6f65548d01..ec355c3387 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 -#define PHP_RELEASE_VERSION 15 +#define PHP_RELEASE_VERSION 17 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.15-dev" -#define PHP_VERSION_ID 50515 +#define PHP_VERSION "5.5.17-dev" +#define PHP_VERSION_ID 50517 |