summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2016-05-26 03:08:57 +0200
committerFerenc Kovacs <tyrael@php.net>2016-05-26 03:08:57 +0200
commit23bf3f418817f80991071ec413a0f1b97481cb88 (patch)
tree9b81fcd7513f698f3f9120458d5e4b25b5d763aa
parentfba887ae24c6ab617d2a457d9ed6e5b1eace9788 (diff)
downloadphp-git-PHP-5.6.22.tar.gz
-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 42b1619ada..71f233bd78 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,20 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-12 May 2016, PHP 5.6.22RC1
+26 May 2016, PHP 5.6.22
- Core:
. Fixed bug #72172 (zend_hex_strtod should not use strlen).
(bwitz at hotmail dot com )
+ . Fixed bug #72114 (Integer underflow / arbitrary null write in
+ fread/gzread). (Stas)
+ . Fixed bug #72135 (Integer Overflow in php_html_entities). (Stas)
+
+- GD:
+ . Fixed bug #72227 (imagescale out-of-bounds read). (Stas)
- Intl
. Fixed bug #64524 (Add intl.use_exceptions to php.ini-*). (Anatol)
+ . Fixed bug #72241 (get_icu_value_internal out-of-bounds read). (Stas)
- Postgres:
. Fixed bug #72151 (mysqli_fetch_object changed behaviour). (Anatol)
diff --git a/configure.in b/configure.in
index 402fc66965..6cadad009f 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=22
-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 10e33f15f0..7a4f0babc9 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 22
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.6.22RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.6.22"
#define PHP_VERSION_ID 50622