summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-12-10 11:30:10 +0100
committerJulien Pauli <jpauli@php.net>2014-12-10 11:30:10 +0100
commit49906f2011a5c2f08b8b5074625da4d3c0d2b40b (patch)
tree859f69dd060efa50f40c7996c4775aee0fa75445
parent07ab86ef3b9d02e11b9685129e01d2d8d67cdf1c (diff)
downloadphp-git-49906f2011a5c2f08b8b5074625da4d3c0d2b40b.tar.gz
5.5.20
-rw-r--r--NEWS9
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 11 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 1faa599ea8..78f65d749f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-27 Nov 2014, PHP 5.5.20RC1
+11 Dec 2014, PHP 5.5.20
- Core:
. Fixed bug #68091 (Some Zend headers lack appropriate extern "C" blocks).
@@ -9,6 +9,10 @@ PHP NEWS
triggered). (Julien)
. Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence)
+- 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).
(David Zuelke, Remi)
@@ -26,6 +30,9 @@ PHP NEWS
(Florian Margaine, Remi)
. Fixed bug #68478 (access.log don't use prefix). (Remi)
+- Mcrypt:
+ . Fixed possible read after end of buffer and use after free. (Dmitry)
+
- PDO_pgsql:
. Fixed bug #66584 (Segmentation fault on statement deallocation) (Matteo)
. Fixed bug #67462 (PDO_PGSQL::beginTransaction() wrongly throws exception
diff --git a/configure.in b/configure.in
index aef43de720..831ab4eeac 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=20
-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 c9483fc87f..100cf75539 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 20
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.20RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.20"
#define PHP_VERSION_ID 50520