5.4.12 rc2

smalyshev · smalyshev · commit 1b8431535df7 · 2013-02-10T01:08:00.000-08:00
diff --git a/NEWS b/NEWS
@@ -1,5 +1,11 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+14 Feb 2012, PHP 5.4.12 RC2
+
+- SOAP
+  . Added check that soap.wsdl_cache_dir conforms to open_basedir. (Dmitry)
+  . Disabled external entities loading. (Dmitry)
+
 31 Jan 2012, PHP 5.4.12 RC1
 
 - Core:
diff --git a/configure.in b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
 PHP_RELEASE_VERSION=12
-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
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
 #define PHP_RELEASE_VERSION 12
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.4.12RC1"
+#define PHP_EXTRA_VERSION "RC2"
+#define PHP_VERSION "5.4.12RC2"
 #define PHP_VERSION_ID 50412
