iliaa Thu, 09 Dec 2010 19:35:13 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=306138
Log: Re-branch 5.2.15 Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/main/php_version.h Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2010-12-09 19:34:23 UTC (rev 306137) +++ php/php-src/branches/PHP_5_2/NEWS 2010-12-09 19:35:13 UTC (rev 306138) @@ -1,7 +1,5 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ?? ????, PHP 5.2.16 - 09 Dec 2010, PHP 5.2.15 - Fixed extract() to do not overwrite $GLOBALS and $this when using EXTR_OVERWRITE. (jorto at redhat dot com) Modified: php/php-src/branches/PHP_5_2/configure.in =================================================================== --- php/php-src/branches/PHP_5_2/configure.in 2010-12-09 19:34:23 UTC (rev 306137) +++ php/php-src/branches/PHP_5_2/configure.in 2010-12-09 19:35:13 UTC (rev 306138) @@ -41,8 +41,8 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 -PHP_RELEASE_VERSION=16 -PHP_EXTRA_VERSION="-dev" +PHP_RELEASE_VERSION=15 +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` Modified: php/php-src/branches/PHP_5_2/main/php_version.h =================================================================== --- php/php-src/branches/PHP_5_2/main/php_version.h 2010-12-09 19:34:23 UTC (rev 306137) +++ php/php-src/branches/PHP_5_2/main/php_version.h 2010-12-09 19:35:13 UTC (rev 306138) @@ -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 16 -#define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.2.16-dev" -#define PHP_VERSION_ID 50216 +#define PHP_RELEASE_VERSION 15 +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.2.15" +#define PHP_VERSION_ID 50215
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php