summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-05-30 21:46:28 +0200
committerJohannes Schlüter <johannes@php.net>2012-05-30 21:46:28 +0200
commitdd3fa4f89669702b7d9dbeccf2baa6b4c4be0e94 (patch)
tree646b7dd635101e141cfc4a7c2da8636caa86df0e
parentc208ad9ddbf712e20a8ce0c0930eb1684e06609a (diff)
downloadphp-git-dd3fa4f89669702b7d9dbeccf2baa6b4c4be0e94.tar.gz
PHP 5.3.14RC2php-5.3.14RC2
-rw-r--r--NEWS11
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 14 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 0501fd42f2..8b14b936a5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+31 May 2012, PHP 5.3.14 RC2
+- COM:
+ . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
+
+- Core:
+ . Fixed CVE-2012-2143. (Solar Designer)
+
+- Intl:
+ . Fixed bug #62082 (Memory corruption in internal function
+ get_icu_disp_value_src_php()). (Gustavo)
+
17 May 2012, PHP 5.3.14RC1
- CLI SAPI:
diff --git a/configure.in b/configure.in
index 61564e9483..4fc677eca2 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=3
PHP_RELEASE_VERSION=14
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION="RC2"
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 400de17306..a7cafd71ce 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 3
#define PHP_RELEASE_VERSION 14
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.3.14RC1"
+#define PHP_EXTRA_VERSION "RC2"
+#define PHP_VERSION "5.3.14RC2"
#define PHP_VERSION_ID 50314