summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-02-10 01:08:00 -0800
committerStanislav Malyshev <stas@php.net>2013-02-10 01:08:00 -0800
commit1b8431535df743cc9c996a6269ce57c33f5bb743 (patch)
treec29e17bc9bc7beb481f51b70e7d334209d3a0da7
parentf2b5b9d69e3eab6fabf208ce7e3b1de5d3809c6f (diff)
downloadphp-git-1b8431535df743cc9c996a6269ce57c33f5bb743.tar.gz
5.4.12 rc2
-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 46c1a5a56e..2686cae2a2 100644
--- 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
index d76d06445c..39869f0ac5 100644
--- 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
index 8abedd948d..76a3fbc455 100644
--- 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