diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2016-06-07 17:38:41 +0700 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2016-06-07 17:38:41 +0700 |
| commit | 3071ba1ff8203bfd6d383754872ba5fe91dbc67e (patch) | |
| tree | 12506488f2b2d1b479a8d85c88b6c47c74f5bf3f | |
| parent | 1bbd7fc7eba62fa4f20d38593959c79503fcb94a (diff) | |
| parent | 041210f44177a9c28a62c64bc84798d80272e3c7 (diff) | |
| download | php-git-3071ba1ff8203bfd6d383754872ba5fe91dbc67e.tar.gz | |
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | main/php_version.h | 6 |
3 files changed, 9 insertions, 5 deletions
@@ -1,6 +1,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2016 PHP 7.0.8 +?? ??? 2016 PHP 7.0.9 + + + +23 Jun 2016 PHP 7.0.8 - Core: . Fixed bug #72221 (segfault, past-the-end access). (Lauri Kenttä) diff --git a/configure.in b/configure.in index 5a437969f4..142cf7f77b 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=7 PHP_MINOR_VERSION=0 -PHP_RELEASE_VERSION=8 +PHP_RELEASE_VERSION=9 PHP_EXTRA_VERSION="-dev" 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 63542ec8d3..f88ce5e69e 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 7 #define PHP_MINOR_VERSION 0 -#define PHP_RELEASE_VERSION 8 +#define PHP_RELEASE_VERSION 9 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "7.0.8-dev" -#define PHP_VERSION_ID 70008 +#define PHP_VERSION "7.0.9-dev" +#define PHP_VERSION_ID 70009 |