summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2013-02-13 21:55:12 +0100
committerJohannes Schlüter <johannes@php.net>2013-02-13 21:55:12 +0100
commit229edf4f3d76bb34637f87b24240631c013ab79e (patch)
tree309a75b93855a78b4683d358cef21ded899ffede
parent588d7adcb2660ab6a4e1736b88c45b7e073aa74d (diff)
downloadphp-git-php-5.3.22RC2.tar.gz
PHP 5.3.22RC2php-5.3.22RC2
-rw-r--r--NEWS6
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 9 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 9bd53509ad..eecff89673 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+14 Feb 2013, PHP 5.3.22RC2
+- SOAP
+ . Added check that soap.wsdl_cache_dir conforms to open_basedir
+ (CVE-2013-1635). (Dmitry)
+ . Disabled external entities loading (CVE-2013-1643). (Dmitry)
+
31 Jan 2013, PHP 5.3.22RC1
- Zend Engine:
diff --git a/configure.in b/configure.in
index ee3f370ea7..9103bbaa2b 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=22
-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 0ab3cac476..51ace4e78b 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 22
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.3.22RC1"
+#define PHP_EXTRA_VERSION "RC2"
+#define PHP_VERSION "5.3.22RC2"
#define PHP_VERSION_ID 50322