summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-08-19 15:10:25 +0200
committerJulien Pauli <jpauli@php.net>2014-08-19 15:10:25 +0200
commitf424a54aff76b9bb65d2d6ab7d168b6e6c9acc2f (patch)
treee4b2d58d3a5ad2b4574ef0ced35a4c6079586d48
parentfc4ded00f8c9b6a3bfcb67a75096c9546ae891a0 (diff)
downloadphp-git-f424a54aff76b9bb65d2d6ab7d168b6e6c9acc2f.tar.gz
5.5.16
-rw-r--r--NEWS6
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 8 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index c103b5da8f..4669a63ef3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-08 Aug 2014, PHP 5.5.16RC1
+21 Aug 2014, PHP 5.5.16
- COM:
. Fixed missing type checks in com_event_sink (Yussuf Khalil, Stas).
@@ -8,6 +8,7 @@ PHP NEWS
- Fileinfo:
. Fixed bug #67705 (extensive backtracking in rule regular expression).
(CVE-2014-3538) (Remi)
+ . Fixed bug #67716 (Segfault in cdf.c). (CVE-2014-3587) (Remi)
- FPM:
. Fixed bug #67635 (php links to systemd libraries without using pkg-config).
@@ -16,6 +17,8 @@ PHP NEWS
- GD:
. Fixed bug #66901 (php-gd 'c_color' NULL pointer dereference).
(CVE-2014-2497) (Remi)
+ . Fixed bug #67730 (Null byte injection possible with imagexxx functions).
+ (CVE-2014-5120) (Ryan Mauger)
- Milter:
. Fixed bug #67715 (php-milter does not build and crashes randomly). (Mike)
@@ -34,6 +37,7 @@ PHP NEWS
- Core:
. Fixed bug #67693 (incorrect push to the empty array) (Tjerk)
+ . Fixed bug #67717 (segfault in dns_get_record). (CVE-2014-3597) (Remi)
- ODBC:
. Fixed bug #60616 (odbc_fetch_into returns junk data at end of multi-byte
diff --git a/configure.in b/configure.in
index b82c6b9220..8aa41b64cc 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=5
PHP_RELEASE_VERSION=16
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION=""
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 11caf9ff24..6a3c8eedc3 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 5
#define PHP_RELEASE_VERSION 16
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.16RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.16"
#define PHP_VERSION_ID 50516