From 17706d367d3715ab47a7c791072e3a7f1a8ac0db Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@gmail.com>
Date: Tue, 9 Jun 2015 16:44:04 -0400
Subject: [PATCH] BUMP 1.6.9

---
 package.xml | 39 ++++++++++++++++++++++++++++++++-------
 php_mongo.h |  2 +-
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/package.xml b/package.xml
index c0b866bbc..ab1d0748d 100644
--- a/package.xml
+++ b/package.xml
@@ -30,11 +30,11 @@
   <active>yes</active>
  </lead>
 
- <date>2015-05-11</date>
- <time>20:56:00</time>
+ <date>2015-06-09</date>
+ <time>20:43:00</time>
  <version>
-  <release>1.6.8</release>
-  <api>1.6.8</api>
+  <release>1.6.9</release>
+  <api>1.6.9</api>
  </version>
  <stability>
   <release>stable</release>
@@ -43,11 +43,14 @@
  <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License</license>
  <notes>
 ** Bug
-    * [PHP-1442] - php_mongo_stream_notify_io() segfault with stream context options
-    * [PHP-1445] - MongoClient does not accept boolean false as "ssl" option
+    * [PHP-1426] - Ensure buffer lengths are checked in bson_to_zval()
+    * [PHP-1448] - Ensure DBPointer namespace length reads as little-endian
+    * [PHP-1450] - Ensure strings are null-terminated in bson_to_zval()
+    * [PHP-1453] - Ensure BSON buffer is checked before reading regex pattern/flags
 
 ** Improvement
-    * [PHP-1446] - Log original string values for parsed boolean options
+    * [PHP-1449] - Ensure value is freed when bson_to_zval() encounters an error
+    * [PHP-1452] - bson_decode() should require exactly one document in buffer
  </notes>
 
  <contents>
@@ -217,6 +220,28 @@
  </extsrcrelease>
  <changelog>
 
+  <release>
+   <date>2015-05-11</date>
+   <time>20:56:00</time>
+   <version>
+    <release>1.6.8</release>
+    <api>1.6.8</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License</license>
+   <notes>
+** Bug
+    * [PHP-1442] - php_mongo_stream_notify_io() segfault with stream context options
+    * [PHP-1445] - MongoClient does not accept boolean false as "ssl" option
+
+** Improvement
+    * [PHP-1446] - Log original string values for parsed boolean options
+   </notes>
+  </release>
+
   <release>
    <date>2015-04-28</date>
    <time>17:05:00</time>
diff --git a/php_mongo.h b/php_mongo.h
index cda58e8a7..87b0c5acd 100644
--- a/php_mongo.h
+++ b/php_mongo.h
@@ -16,7 +16,7 @@
 #ifndef PHP_MONGO_H
 #define PHP_MONGO_H 1
 
-#define PHP_MONGO_VERSION "1.6.9-dev"
+#define PHP_MONGO_VERSION "1.6.9"
 #define PHP_MONGO_EXTNAME "mongo"
 
 #ifdef HAVE_CONFIG_H