From 704bbb3263d0ec9a6b4a767bbc516e55388f4b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= <johannes@php.net>
Date: Wed, 25 Apr 2012 00:13:15 +0200
Subject: PHP 5.3.11

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

diff --git a/NEWS b/NEWS
index 5255db19d8..d26ffea8ab 100644
--- a/NEWS
+++ b/NEWS
@@ -1,25 +1,10 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-12 Apr 2012, PHP 5.3.11RC2
+26 Apr 2012, PHP 5.3.11
 
 - Core:
   . Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables
     (without apache2)). (Laruence)
-
-- Fileinfo
-  . Upgraded libmagic to 5.11 (Pierre, Anatoliy)
-  . Fixed bug #61565 where php_stream_open_wrapper_ex tries to open a
-    directory descriptor under windows. (Anatoliy)
-  . Fixed bug #61566 failure caused by the posix lseek and read versions
-    under windows in cdf_read(). (Anatoliy)
-
-- pgsql:
-  . Fixed bug #60718 (Compile problem with libpq (PostgreSQL 7.3 or less).
-    (Yasuo Ohgaki)
-
-29 Mar 2012, PHP 5.3.11RC1
-
-- Core:
   . Fixed bug #61273 (call_user_func_array with more than 16333 arguments
     leaks / crashes). (Laruence)
   . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
@@ -66,6 +51,11 @@ PHP                                                                        NEWS
   . Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
 
 - Fileinfo
+  . Upgraded libmagic to 5.11 (Pierre, Anatoliy)
+  . Fixed bug #61565 where php_stream_open_wrapper_ex tries to open a
+    directory descriptor under windows. (Anatoliy)
+  . Fixed bug #61566 failure caused by the posix lseek and read versions
+    under windows in cdf_read(). (Anatoliy)
   . Fixed bug #61173 (Unable to detect error from finfo constructor). (Gustavo)
 
 - Firebird Database extension (ibase):
@@ -94,6 +84,10 @@ PHP                                                                        NEWS
 - PDO_Sqlite extension:
   . Add createCollation support. (Damien)
 
+- pgsql:
+  . Fixed bug #60718 (Compile problem with libpq (PostgreSQL 7.3 or less).
+    (Yasuo Ohgaki)
+
 - Phar:
   . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
     bytes). (Nikic)
diff --git a/configure.in b/configure.in
index a7d9440ca7..a74771e86b 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=11
-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 2a85944de2..d3037da187 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 11
-#define PHP_EXTRA_VERSION "RC2"
-#define PHP_VERSION "5.3.11RC2"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.3.11"
 #define PHP_VERSION_ID 50311
-- 
cgit v1.2.1