diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2011-01-06 23:02:27 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2011-01-06 23:02:27 +0000 |
| commit | 92f7256ef1ba52c5c021efb72bc90fa190879402 (patch) | |
| tree | 2dfab12c13698401ff217154c6d59327484e1ab7 | |
| parent | 30e646497e17825e642863a54b6a26efe903372e (diff) | |
| download | php-git-92f7256ef1ba52c5c021efb72bc90fa190879402.tar.gz | |
back to dev
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | main/php_version.h | 8 |
3 files changed, 9 insertions, 6 deletions
@@ -1,5 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? ????, PHP 5.2.18 +- Fixed bug #53682 (Fix compile on the VAX). (Rasmus, jklos) + 06 Jan 2010, PHP 5.2.17 - Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott, Rasmus) diff --git a/configure.in b/configure.in index 8ebe91cfd4..5af0c1141c 100644 --- a/configure.in +++ b/configure.in @@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=17 -PHP_EXTRA_VERSION="" +PHP_RELEASE_VERSION=18 +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 b07fdf4260..851d0e13f8 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 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 17 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.2.17" -#define PHP_VERSION_ID 50217 +#define PHP_RELEASE_VERSION 18 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.2.18-dev" +#define PHP_VERSION_ID 50218 |