Merged master branch

HISTORY

@@ -2,8 +2,10 @@
 - Allow multiple bson docs to be serialized in bson parser in one go (avoid context switch on c++ driver)
 - Amortize documents (only deserialize when accessed)
 - New C++ serializer code (based on js)
-- MongoS tests
-- Better error handling for MongoS situation ()
+- Mongo tests to handle special Mongos situations
+
+0.9.7.2-2 2011-12-16
+* Fixes infinite streamRecords QueryFailure fix when using Mongos (Issue #442)
 
 0.9.7.2-1 2011-12-16
 * ~10% perf improvement for ObjectId#toHexString (Issue #448, https://github.com/aheckmann)

lib/mongodb/cursor.js

@@ -610,7 +610,14 @@ Cursor.prototype.streamRecords = function(options) {
         self.getMoreCommand = new GetMoreCommand(self.db, self.collectionName, queryCommand.numberToReturn, result.cursorId);
       }
 
-      if (result.documents && result.documents.length) {
+      var resflagsMap = {
+        CursorNotFound:1<<0,
+        QueryFailure:1<<1,
+        ShardConfigStale:1<<2,
+        AwaitCapable:1<<3
+      };
+
+      if(result.documents && result.documents.length && !(result.responseFlag & resflagsMap.QueryFailure)) {
         try {
           result.documents.forEach(function(doc){
             if (recordLimitValue && emittedRecordCount>=recordLimitValue) {

package.json

@@ -1,7 +1,7 @@
 { "name" :            "mongodb"
 , "description" :     "A node.js driver for MongoDB"
 , "keywords" :        ["mongodb", "mongo", "driver", "db"]
-, "version" :         "0.9.7-2-1"
+, "version" :         "0.9.7-2-2"
 , "author" :          "Christian Amor Kvalheim <christkv@gmail.com>"
 , "contributors" :  [ "Aaron Heckmann",
                       "Christoph Pojer",