5.4.12

smalyshev · smalyshev · commit 0183c29cb392 · 2013-02-18T17:35:36.000-08:00
diff --git a/NEWS b/NEWS
@@ -1,13 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-14 Feb 2012, PHP 5.4.12 RC2
-
-- 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 2012, PHP 5.4.12 RC1
+21 Feb 2012, PHP 5.4.12
 
 - Core:
   . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes)
@@ -39,7 +32,12 @@ PHP                                                                        NEWS
 - Litespeed:
   . Fixed bug #63228 (-Werror=format-security error in lsapi code). (George)
 
-- ext/sqlite3:
+- SOAP
+  . Added check that soap.wsdl_cache_dir conforms to open_basedir 
+    (CVE-2013-1635). (Dmitry)
+  . Disabled external entities loading (CVE-2013-1643). (Dmitry)
+
+- sqlite3:
   . Fixed bug #63921 (sqlite3::bindvalue and relative PHP functions aren't
     using sqlite3_*_int64 API). (srgoogleguy, Lars)
 
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="RC2"
+PHP_EXTRA_VERSION=""
 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 "RC2"
-#define PHP_VERSION "5.4.12RC2"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.12"
 #define PHP_VERSION_ID 50412
