summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2016-05-25 11:36:00 +0200
committerJulien Pauli <jpauli@php.net>2016-05-25 11:36:00 +0200
commit527e8e73c97e282b1efde24cfb95dc0942e0ad59 (patch)
tree1cbba26ed31fad0cf5cc94c71c065a5a145e31ad
parent9a826a3bd99315b7c4d4673acd3084c99eb04253 (diff)
downloadphp-git-PHP-5.5.36.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 afc6fa77d9..e77a62a76b 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 **
26 May 2016, PHP 5.5.36
diff --git a/configure.in b/configure.in
index 375e5941b9..d24ccf1103 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=36
-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 ee8de7b4e7..587a8c8cf3 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 36
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.36-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.36"
#define PHP_VERSION_ID 50536