summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-10-29 10:55:01 +0100
committerFerenc Kovacs <tyrael@php.net>2015-10-29 10:55:01 +0100
commit8eff5afaced13c9c30337c11da4920fc1d2394ce (patch)
treeec311f11fa4896d4ef48e8ccaa9c5897af67b62a
parent73864abab1f4272506c3cae3c2008319467798e3 (diff)
downloadphp-git-PHP-5.6.15.tar.gz
prepare for 5.6.15php-5.6.15PHP-5.6.15
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 2b57335e7c..cceba66d75 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-15 Oct 2015, PHP 5.6.15
+29 Oct 2015, PHP 5.6.15
- Core:
. Fixed bug #70681 (Segfault when binding $this of internal instance method
diff --git a/configure.in b/configure.in
index e4111c1b4a..c383232b12 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=6
PHP_RELEASE_VERSION=15
-PHP_EXTRA_VERSION="RC1"
+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 9887ccd1f3..f1ed780da5 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 6
#define PHP_RELEASE_VERSION 15
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.6.15RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.6.15"
#define PHP_VERSION_ID 50615