summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2013-12-11 00:31:06 +0100
committerJulien Pauli <jpauli@php.net>2013-12-11 00:31:06 +0100
commit6daaf1103b9ea36ecf04c5cffee9e8287fdf39c7 (patch)
tree4d9434b91e73b0670614b67a8dd3fd53454a4d3e
parent073d24bb50eeab6b592d044c71e530afac0a474a (diff)
downloadphp-git-PHP-5.5.7.tar.gz
-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 49848b1c47..0e56203fd9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-28 Nov 2013, PHP 5.5.7RC1
+12 Dec 2013, PHP 5.5.7
- CLI server:
. Added some MIME types to the CLI web server (Chris Jones)
@@ -17,6 +17,10 @@ PHP NEWS
. Fixed bug #65559 (Opcache: cache not cleared if changes occur while
running). (Dmitry)
+- OpenSSL:
+ . Fixed memory corruption in openssl_x509_parse() (CVE-2013-6420).
+ (Stefan Esser).
+
- readline
. Fixed Bug #65714 (PHP cli forces the tty to cooked mode). (Remi)
diff --git a/configure.in b/configure.in
index 8bf2f06871..e934acc419 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=7
-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 5ad7c140cf..710241b6cf 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 7
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.7RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.7"
#define PHP_VERSION_ID 50507