summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2015-09-30 13:01:11 +0200
committerJulien Pauli <jpauli@php.net>2015-09-30 13:01:11 +0200
commit3f08fc0466a2acd38763b23f85e06eb02950c6ea (patch)
treeaf18ee33aa15cc1f50ceb200bcb8fe24934c7b9c
parent932f70717717ed7b338e0f5e7b5cd99c7afab1e1 (diff)
downloadphp-git-3f08fc0466a2acd38763b23f85e06eb02950c6ea.tar.gz
5.5.31 now
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 7 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index fbe94ee7ee..d5b5016763 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
** PHP 5.5 is in security-only mode , please do not commit to this branch **
-?? ??? 2015, PHP 5.5.30
+?? ??? 2015, PHP 5.5.31
+
+01 Oct 2015, PHP 5.5.30
- Phar:
. Fixed bug #69720 (Null pointer dereference in phar_get_fp_offset()). (Stas)
diff --git a/configure.in b/configure.in
index b8675ad5af..6dcfdf4e3f 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=30
+PHP_RELEASE_VERSION=31
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 2128d749cc..02dab19917 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 30
+#define PHP_RELEASE_VERSION 31
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.30-dev"
-#define PHP_VERSION_ID 50530
+#define PHP_VERSION "5.5.31-dev"
+#define PHP_VERSION_ID 50531