NODE-770 Cannot set socketTimeoutMS to 0 in MongoClient.connect

Author: christkv

lib/mongo_client.js

@@ -159,8 +159,8 @@ function translateOptions(options) {
   }
 
   // Set the socket and connection timeouts
-  if(!options.socketTimeoutMS) options.socketTimeoutMS = 30000;
-  if(!options.connectTimeoutMS) options.connectTimeoutMS = 30000;
+  if(!options.socketTimeoutMS == null) options.socketTimeoutMS = 30000;
+  if(!options.connectTimeoutMS == null) options.connectTimeoutMS = 30000;
 
   // Create server instances
   return options.servers.map(function(serverObj) {
@@ -270,8 +270,8 @@ var connect = function(url, options, callback) {
   _finalOptions = createUnifiedOptions(_finalOptions, options);
 
   // Check if we have connection and socket timeout set
-  if(!_finalOptions.socketTimeoutMS) _finalOptions.socketTimeoutMS = 120000;
-  if(!_finalOptions.connectTimeoutMS) _finalOptions.connectTimeoutMS = 120000;
+  if(!_finalOptions.socketTimeoutMS == null) _finalOptions.socketTimeoutMS = 120000;
+  if(!_finalOptions.connectTimeoutMS == null) _finalOptions.connectTimeoutMS = 120000;
 
   // Failure modes
   if(object.servers.length == 0) {

test/functional/mongo_client_tests.js

@@ -584,3 +584,34 @@ exports['Should correctly pass through appname'] = {
     });
   }
 }
+
+exports['Should correctly pass through socketTimeoutMS and connectTimeoutMS'] = {
+  metadata: {
+    requires: {
+      node: ">0.8.0",
+      topology: ['single', 'replicaset', 'sharded']
+    }
+  },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var MongoClient = configuration.require.MongoClient;
+    MongoClient.connect(configuration.url(), {
+      socketTimeoutMS: 0,
+      connectTimeoutMS: 0
+    }, function(err, db) {
+      test.equal(null, err);
+
+      if(db.s.topology.s.clonedOptions) {
+        test.equal(0, db.s.topology.s.clonedOptions.connectionTimeout);
+        test.equal(0, db.s.topology.s.clonedOptions.socketTimeout);
+      } else {
+        test.equal(0, db.s.topology.s.options.connectionTimeout);
+        test.equal(0, db.s.topology.s.options.socketTimeout);
+      }
+
+      db.close();
+      test.done();
+    });
+  }
+}