From 13616e8856076ee7bd3d661fd492326565ae48ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= <johannes@php.net>
Date: Wed, 20 Feb 2013 11:52:37 +0100
Subject: PHP 5.3.22

---
 NEWS               | 13 ++++++-------
 configure.in       |  2 +-
 main/php_version.h |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index eecff89673..1edac3ebed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,6 @@
 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
+21 Feb 2013, PHP 5.3.22
 
 - Zend Engine:
   . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes)
@@ -23,6 +17,11 @@ PHP                                                                        NEWS
 - FPM:
   . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam)
 
+- SOAP
+  . Added check that soap.wsdl_cache_dir conforms to open_basedir
+    (CVE-2013-1635). (Dmitry)
+  . Disabled external entities loading (CVE-2013-1643). (Dmitry)
+
 - SPL:
   . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended). (Nikita Popov)
 
diff --git a/configure.in b/configure.in
index 9103bbaa2b..bc20d1b343 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="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
index 51ace4e78b..fd6b46afb1 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 "RC2"
-#define PHP_VERSION "5.3.22RC2"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.3.22"
 #define PHP_VERSION_ID 50322
-- 
cgit v1.2.1