diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2010-12-03 00:29:16 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2010-12-03 00:29:16 +0000 |
| commit | 8b7fe19996f27662c5118b85765b0e77d77c6669 (patch) | |
| tree | 7f06c55663cd6acf6f74db0a643e659839a0644b | |
| parent | 0ad7e9b70c57125192669e83a42059a0a7638ee1 (diff) | |
| download | php-git-8b7fe19996f27662c5118b85765b0e77d77c6669.tar.gz | |
Back to dev
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | main/php_version.h | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -1,5 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ??? 2010, PHP 5.2.15 + 02 Dec 2010, PHP 5.2.15RC2 - 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 8652f67b1b..b85b2080ba 100644 --- a/configure.in +++ b/configure.in @@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h) PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=15 -PHP_EXTRA_VERSION="RC2" +PHP_EXTRA_VERSION="RC3-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 e85e829d48..761ee5b7ae 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 15 -#define PHP_EXTRA_VERSION "RC2" -#define PHP_VERSION "5.2.15RC2" +#define PHP_EXTRA_VERSION "RC3-dev" +#define PHP_VERSION "5.2.15RC3-dev" #define PHP_VERSION_ID 50215 |