summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2016-02-02 10:42:49 +0100
committerJulien Pauli <jpauli@php.net>2016-02-02 10:42:49 +0100
commit7d875fb9df7336a220b3a61bc6ebe87c7182c4a9 (patch)
tree11e62c0f775b73b6bba6ef2c1c589f3d63e0bddc
parent2a7d8c0a06de8123034b136b0c717576b6e36fae (diff)
downloadphp-git-7d875fb9df7336a220b3a61bc6ebe87c7182c4a9.tar.gz
Going for 5.5.33 now
-rw-r--r--NEWS10
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 13 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index adfa1e1428..a758db5b6e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,9 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
** PHP 5.5 is in security-only mode , please do not commit to this branch **
-?? ??? 2016, PHP 5.5.32
+?? ??? 2016, PHP 5.5.33
+
+04 Feb 2016, PHP 5.5.32
- Core:
. Fixed bug #71039 (exec functions ignore length but look for NULL termination).
@@ -10,6 +12,12 @@ PHP NEWS
input). (Leo Gaspard)
. Fixed bug #71459 (Integer overflow in iptcembed()). (Stas)
+- GD:
+ . Improved the fix for bug #70976. (Remi)
+
+- PCRE:
+ . Upgraded pcrelib to 8.38.
+
- Phar:
. Fixed bug #71354 (Heap corruption in tar/zip/phar parser). (Stas)
. Fixed bug #71391 (NULL Pointer Dereference in phar_tar_setupmetadata()).
diff --git a/configure.in b/configure.in
index f8f376ecb6..d80ab94bc8 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=32
+PHP_RELEASE_VERSION=33
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 10c1d32c80..e9feae6a51 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 32
+#define PHP_RELEASE_VERSION 33
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.32-dev"
-#define PHP_VERSION_ID 50532
+#define PHP_VERSION "5.5.33-dev"
+#define PHP_VERSION_ID 50533