From: Ilia Alshanetsky Date: Wed, 7 Feb 2007 01:01:37 +0000 (+0000) Subject: Back to dev X-Git-Tag: php-5.2.2RC1~455 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f8e222ab36a12c9e3bd2ed3fff1db482d616bff;p=php Back to dev --- diff --git a/NEWS b/NEWS index dd45cf0f86..a6b97ccb92 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? 2007, PHP 5.2.2 + 08 Feb 2007, PHP 5.2.1 - Added read-timeout context option "timeout" for HTTP streams. (Hannes, Ilia). - Added CURLOPT_TCP_NODELAY constant to Curl extension. (Sara) diff --git a/configure.in b/configure.in index a491a702fb..ab45c10ba0 100644 --- a/configure.in +++ b/configure.in @@ -43,8 +43,8 @@ AC_CONFIG_HEADER(main/php_config.h) MAJOR_VERSION=5 MINOR_VERSION=2 -RELEASE_VERSION=1 -EXTRA_VERSION="" +RELEASE_VERSION=2 +EXTRA_VERSION="-dev" PHP_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 10000 + [$]MINOR_VERSION \* 100 + [$]RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index d2e8383a1d..679375d09a 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 1 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.2.1" -#define PHP_VERSION_ID 50201 +#define PHP_RELEASE_VERSION 2 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.2.2-dev" +#define PHP_VERSION_ID 50202