From cb80afc366df74ec7ab701a853407a69cc148f5d Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 25 Nov 2015 21:28:38 +0100
Subject: prepare for 5.6.16

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

diff --git a/NEWS b/NEWS
index 8a29c85bf6..a399424d24 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-12 Nov 2015, PHP 5.6.16RC1
+26 Nov 2015, PHP 5.6.16
 
 - Core:
   . Fixed bug #70828 (php-fpm 5.6 with opcache crashes when referencing a
@@ -8,8 +8,13 @@ PHP                                                                        NEWS
   . Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l).
     (Laruence)
 
+- Mysqlnd:
+  . Fixed bug #68344 (MySQLi does not provide way to disable peer certificate
+    validation) by introducing MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
+        connection flag. (Andrey)
+
 - OCI8:
-  . Fixed bug #68298 (OCI int overflow) (Senthil).
+  . Fixed bug #68298 (OCI int overflow). (Senthil)
 
 - PDO_DBlib:
   . Fixed bug #69757 (Segmentation fault on nextRowset).
@@ -20,7 +25,7 @@ PHP                                                                        NEWS
     attribute). (Matteo)
 
 - SPL:
-  . Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.
+  . Fixed bug #70852 (Segfault getting NULL offset of an ArrayObject).
     (Reeze Xia)
 
 29 Oct 2015, PHP 5.6.15
diff --git a/configure.in b/configure.in
index 4d561c0e86..f26f5fe261 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=6
 PHP_RELEASE_VERSION=16
-PHP_EXTRA_VERSION="RC1"
+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 63905ff936..f7d8e3f221 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 6
 #define PHP_RELEASE_VERSION 16
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.6.16RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.6.16"
 #define PHP_VERSION_ID 50616
-- 
cgit v1.2.1