summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-12-10 14:00:11 +0100
committerJulien Pauli <jpauli@php.net>2014-12-10 14:12:55 +0100
commiteaaa35297560356a154a0594c2770a07256d4c9e (patch)
tree50d74711c30f82f8b063401976098c6c64e8918b
parent239bfe29a1e50beeaf0f1c3db8b2d1385d53ad47 (diff)
downloadphp-git-eaaa35297560356a154a0594c2770a07256d4c9e.tar.gz
5.6.4
-rw-r--r--NEWS8
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 11 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index a1cc58b5fb..09b609e309 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,11 @@ PHP NEWS
(Alexander Lisachenko)
. Fixed bug #68446 (Array constant not accepted for array parameter default).
(Bob, Dmitry)
+ . Fixed bug #68545 (NULL pointer dereference in unserialize.c). (Anatol)
+
+- Date:
+ . Fixed day_of_week function as it could sometimes return negative values
+ internally. (Derick)
- FPM:
. Fixed bug #68381 (fpm_unix_init_main ignores log_level).
@@ -37,6 +42,9 @@ PHP NEWS
- GMP:
. Fixed bug #68419 (build error with gmp 4.1). (Remi)
+- Mcrypt:
+ . Fixed possible read after end of buffer and use after free. (Dmitry)
+
- PDO_pgsql:
. Fixed bug #67462 (PDO_PGSQL::beginTransaction() wrongly throws exception
when not in transaction) (Matteo)
diff --git a/configure.in b/configure.in
index 2ceefd1355..3ca75878bb 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=6
PHP_RELEASE_VERSION=4
-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 6d5d93a4ec..ecf54ed7e6 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 6
#define PHP_RELEASE_VERSION 4
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.6.4RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.6.4"
#define PHP_VERSION_ID 50604