diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2010-12-09 19:35:13 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2010-12-09 19:35:13 +0000 |
| commit | 953b01e2f55816a90b95566faa90e6aedc931e3d (patch) | |
| tree | da710697622c786b86e00ed3e50e4adddf7e8340 | |
| parent | ec20844001b85aa4dd24c71c8adc209fdae73915 (diff) | |
| download | php-git-953b01e2f55816a90b95566faa90e6aedc931e3d.tar.gz | |
Re-branch 5.2.15
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | main/php_version.h | 8 |
3 files changed, 6 insertions, 8 deletions
@@ -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) diff --git a/configure.in b/configure.in index a74485ce3b..9cedfa8a19 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=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` diff --git a/main/php_version.h b/main/php_version.h index 883d5f2969..fe29056662 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 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 |