summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2016-04-26 22:34:00 +0200
committerJulien Pauli <jpauli@php.net>2016-04-26 22:34:00 +0200
commitf856734c6789314ce50b19d36d523911ef6c6a79 (patch)
treee3bdec448fb655fd6f65279ef6f8dc4e02a43c87
parent082aecfc3a753ad03be82cf14f03ac065723ec92 (diff)
downloadphp-git-f856734c6789314ce50b19d36d523911ef6c6a79.tar.gz
5.5.36 now
-rw-r--r--NEWS21
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 24 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 6a7d63bd5f..969ad66762 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,26 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
** PHP 5.5 is in security-only mode , please do not commit to this branch **
-??? 2016, PHP 5.5.35
+??? 2016, PHP 5.5.36
+
+
+
+28 Apr 2016, PHP 5.5.35
+
+- BCMath:
+ . Fix bug #72093 (bcpowmod accepts negative scale and corrupts _one_
+ definition). (Stas)
+
+- Exif:
+ . Fix bug #72094 (Out of bounds heap read access in exif header
+ processing). (Stas)
+
+- GD:
+ . Fix bug #71912 (libgd: signedness vulnerability). (Stas)
+
+- Intl:
+ . Fix bug #72061 (Out-of-bounds reads in zif_grapheme_stripos with negative
+ offset). (Stas)
31 Mar 2016, PHP 5.5.34
diff --git a/configure.in b/configure.in
index c46011a30d..375e5941b9 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=35
+PHP_RELEASE_VERSION=36
PHP_EXTRA_VERSION="-dev"
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 4ebff7f9ac..ee8de7b4e7 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 5
-#define PHP_RELEASE_VERSION 27
+#define PHP_RELEASE_VERSION 36
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.27-dev"
-#define PHP_VERSION_ID 50527
+#define PHP_VERSION "5.5.36-dev"
+#define PHP_VERSION_ID 50536