com php-src: prepare for 5.6.15: NEWS configure.in main/php_v ersion.h

Commit: 8eff5afaced13c9c30337c11da4920fc1d2394ce Author: Ferenc Kovacs <tyrael@php.net> Thu, 29 Oct 2015 10:55:01 +0100 Parents: 73864abab1f4272506c3cae3c2008319467798e3 Branches: PHP-5.6.15 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8eff5afaced13c9c30337c11da4920fc1d2394ce Log: prepare for 5.6.15 Changed paths: M NEWS M configure.in M main/php_version.h Diff: diff --git a/NEWS b/NEWS index 2b57335..cceba66 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 e4111c1..c383232 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 9887ccd..f1ed780 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