pr

Author: Oleksandr Poliakov

src/MongoDB.Driver/Core/Configuration/ConnectionString.cs

@@ -469,7 +469,7 @@ public bool? Ssl
         public bool? SslVerifyCertificate => !_tlsInsecure;
 
         /// <summary>
-        /// Gets the per-operation timeout
+        /// Gets the per-operation timeout.
         /// </summary>
         public TimeSpan? Timeout => _timeout;
 
@@ -1096,7 +1096,7 @@ private void ParseOption(string name, string value)
                     break;
                 case "timeout":
                 case "timeoutms":
-                    _timeout = ParseTimeSpan(name, value);
+                    _timeout = value == "0" ? System.Threading.Timeout.InfiniteTimeSpan : ParseTimeSpan(name, value);
                     break;
                 case "tlsdisablecertificaterevocationcheck":
                     var tlsDisableCertificateRevocationCheckValue = ParseBoolean(name, value);

src/MongoDB.Driver/Core/Servers/RoundTripTimeMonitor.cs

@@ -125,7 +125,7 @@ private void MonitorServer()
             _logger?.LogDebug(_serverId, "Monitoring started");
 
             var helloOk = false;
-            using var operationContext = new OperationContext(Timeout.InfiniteTimeSpan, _cancellationToken);
+            using var operationContext = new OperationContext(null, _cancellationToken);
             while (!operationContext.IsCancelledOrTimedOut())
             {
                 try

src/MongoDB.Driver/MongoUrlBuilder.cs

@@ -971,7 +971,7 @@ public override string ToString()
             }
             if (_timeout.HasValue)
             {
-                query.AppendFormat("timeout={0}&", FormatTimeSpan(_timeout.Value));
+                query.AppendFormat("timeout={0}&", _timeout == System.Threading.Timeout.InfiniteTimeSpan ? "0" : FormatTimeSpan(_timeout.Value));
             }
 #pragma warning disable 618
             if (_waitQueueMultiple != 0.0 && _waitQueueMultiple != MongoDefaults.WaitQueueMultiple)

tests/MongoDB.Driver.Tests/Core/Configuration/ConnectionStringTests.cs

@@ -1052,6 +1052,8 @@ public void When_sslVerifyCertificate_is_specified(string connectionString, bool
         }
 
         [Theory]
+        [InlineData("mongodb://localhost?timeoutMS=0", -1)]
+        [InlineData("mongodb://localhost?timeout=0", -1)]
         [InlineData("mongodb://localhost?timeout=15ms", 15)]
         [InlineData("mongodb://localhost?timeoutMS=15", 15)]
         [InlineData("mongodb://localhost?timeout=15", 1000 * 15)]

tests/MongoDB.Driver.Tests/MongoUrlBuilderTests.cs

@@ -16,7 +16,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using FluentAssertions;
 using MongoDB.Bson.IO;
 using MongoDB.Driver.Core.Compression;
@@ -1143,6 +1142,7 @@ public void TestSocketTimeout_Range()
 
         [Theory]
         [InlineData(null, "mongodb://localhost", new[] { "" })]
+        [InlineData(-1, "mongodb://localhost/?timeout{0}", new[] { "=0", "MS=0" })]
         [InlineData(500, "mongodb://localhost/?timeout{0}", new[] { "=500ms", "=0.5", "=0.5s", "=00:00:00.5", "MS=500" })]
         [InlineData(30000, "mongodb://localhost/?timeout{0}", new[] { "=30s", "=30000ms", "=30", "=0.5m", "=00:00:30", "MS=30000" })]
         [InlineData(1800000, "mongodb://localhost/?timeout{0}", new[] { "=30m", "=1800000ms", "=1800", "=1800s", "=0.5h", "=00:30:00", "MS=1800000" })]