summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2015-09-02 17:39:30 +0200
committerJulien Pauli <jpauli@php.net>2015-09-02 17:39:30 +0200
commit58b8d9d27eb2bcdf5de2197bbd80949c05ecb88d (patch)
treeac5a3307c87b2f4d6c4918994d1c1785abf818be
parent43c2dfa7b3c0e42ddd8f181200ea34bdb7b8cfd0 (diff)
downloadphp-git-58b8d9d27eb2bcdf5de2197bbd80949c05ecb88d.tar.gz
prepare for 5.5.29
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 3 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index a8b3a82c61..005f62c599 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,5 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015, PHP 5.5.30
-
-** PHP 5.5 is in security-only mode , please do not commit to this branch **
-
03 Sep 2015, PHP 5.5.29
- Core:
diff --git a/configure.in b/configure.in
index a171d11430..fb32bcf5a8 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=29
-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 8da8c05dd9..66555c933e 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 29
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.29-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.29"
#define PHP_VERSION_ID 50529