CDRIVER-630 "0" value means "default" for TLS handshake timeout

ajdavis · ajdavis · commit 30162bb1a0d7 · 2015-05-08T14:06:57.000-04:00
diff --git a/src/mongoc/mongoc-client.c b/src/mongoc/mongoc-client.c
@@ -339,7 +339,9 @@ mongoc_client_default_stream_initiator (const mongoc_uri_t       *uri,
 
          if (bson_iter_init_find_case (&iter, options, "connecttimeoutms") &&
              BSON_ITER_HOLDS_INT32 (&iter)) {
-            connecttimeoutms = bson_iter_int32 (&iter);
+            if (!(connecttimeoutms = bson_iter_int32(&iter))) {
+               connecttimeoutms = MONGOC_DEFAULT_CONNECTTIMEOUTMS;
+            }
          }
 
          if (!mongoc_stream_tls_do_handshake (base_stream, connecttimeoutms) ||

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,9 @@ mongoc_client_default_stream_initiator (const mongoc_uri_t *uri,`
`339`	`339`
`340`	`340`	`if (bson_iter_init_find_case (&iter, options, "connecttimeoutms") &&`
`341`	`341`	`BSON_ITER_HOLDS_INT32 (&iter)) {`
`342`		`- connecttimeoutms = bson_iter_int32 (&iter);`
	`342`	`+ if (!(connecttimeoutms = bson_iter_int32(&iter))) {`
	`343`	`+ connecttimeoutms = MONGOC_DEFAULT_CONNECTTIMEOUTMS;`
	`344`	`+ }`
`343`	`345`	`}`
`344`	`346`
`345`	`347`	`if (!mongoc_stream_tls_do_handshake (base_stream, connecttimeoutms) \|\|`