summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2016-01-06 10:18:17 +0100
committerJulien Pauli <jpauli@php.net>2016-01-06 10:36:49 +0100
commit6c78ce66de2a9c4f872ae67b967a5c6e2a8f6c47 (patch)
tree9aa2736b04ee9407b2d30e87b6e6df2b86663fa5
parent74dcbe12997132353fd75d0c14548cff5235329f (diff)
downloadphp-git-PHP-5.5.31.tar.gz
-rw-r--r--NEWS1
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 3 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index ee0e9869bd..07c5237015 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,5 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-** PHP 5.5 is in security-only mode , please do not commit to this branch **
07 Jan 2015, PHP 5.5.31
diff --git a/configure.in b/configure.in
index 6dcfdf4e3f..c5ecd5bbba 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=31
-PHP_EXTRA_VERSION="-dev"
+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 02dab19917..92ead6d93e 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 31
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.31-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.31"
#define PHP_VERSION_ID 50531