For COPY operations treat 0 as infinite timeout in addition to -1 (#6352)

vonzshik · web-flow · commit 785b0b8f03c9 · 2025-12-18T14:01:51.000Z
Fixes #6351
diff --git a/src/Npgsql/NpgsqlBinaryExporter.cs b/src/Npgsql/NpgsqlBinaryExporter.cs
@@ -7,6 +7,7 @@
 using Npgsql.Internal;
 using Npgsql.Internal.Postgres;
 using NpgsqlTypes;
+using InfiniteTimeout = System.Threading.Timeout;
 using static Npgsql.Util.Statics;
 
 namespace Npgsql;
@@ -46,7 +47,7 @@ public sealed class NpgsqlBinaryExporter : ICancelable
     /// </summary>
     public TimeSpan Timeout
     {
-        set => _buf.Timeout = value;
+        set => _buf.Timeout = value > TimeSpan.Zero ? value : InfiniteTimeout.InfiniteTimeSpan;
     }
 
     Activity? _activity;
diff --git a/src/Npgsql/NpgsqlBinaryImporter.cs b/src/Npgsql/NpgsqlBinaryImporter.cs
@@ -8,6 +8,7 @@
 using Npgsql.Internal;
 using Npgsql.Internal.Postgres;
 using NpgsqlTypes;
+using InfiniteTimeout = System.Threading.Timeout;
 using static Npgsql.Util.Statics;
 
 namespace Npgsql;
@@ -55,8 +56,9 @@ public TimeSpan Timeout
     {
         set
         {
-            _buf.Timeout = value;
-            _connector.ReadBuffer.Timeout = value;
+            var timeout = value > TimeSpan.Zero ? value : InfiniteTimeout.InfiniteTimeSpan;
+            _buf.Timeout = timeout;
+            _connector.ReadBuffer.Timeout = timeout;
         }
     }
 
diff --git a/src/Npgsql/NpgsqlRawCopyStream.cs b/src/Npgsql/NpgsqlRawCopyStream.cs
@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Logging;
 using Npgsql.BackendMessages;
 using Npgsql.Internal;
+using InfiniteTimeout = System.Threading.Timeout;
 using static Npgsql.Util.Statics;
 
 #pragma warning disable 1591
@@ -42,12 +43,12 @@ public sealed class NpgsqlRawCopyStream : Stream, ICancelable
     public override int WriteTimeout
     {
         get => (int) _writeBuf.Timeout.TotalMilliseconds;
-        set => _writeBuf.Timeout = TimeSpan.FromMilliseconds(value);
+        set => _writeBuf.Timeout = value > 0 ? TimeSpan.FromMilliseconds(value) : InfiniteTimeout.InfiniteTimeSpan;
     }
     public override int ReadTimeout
     {
         get => (int) _readBuf.Timeout.TotalMilliseconds;
-        set => _readBuf.Timeout = TimeSpan.FromMilliseconds(value);
+        set => _readBuf.Timeout = value > 0 ? TimeSpan.FromMilliseconds(value) : InfiniteTimeout.InfiniteTimeSpan;
     }
 
     /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Npgsql.Internal;`
`8`	`8`	`using Npgsql.Internal.Postgres;`
`9`	`9`	`using NpgsqlTypes;`
	`10`	`+using InfiniteTimeout = System.Threading.Timeout;`
`10`	`11`	`using static Npgsql.Util.Statics;`
`11`	`12`
`12`	`13`	`namespace Npgsql;`
`@@ -46,7 +47,7 @@ public sealed class NpgsqlBinaryExporter : ICancelable`
`46`	`47`	`/// </summary>`
`47`	`48`	`public TimeSpan Timeout`
`48`	`49`	`{`
`49`		`- set => _buf.Timeout = value;`
	`50`	`+ set => _buf.Timeout = value > TimeSpan.Zero ? value : InfiniteTimeout.InfiniteTimeSpan;`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`Activity? _activity;`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using Npgsql.Internal;`
`9`	`9`	`using Npgsql.Internal.Postgres;`
`10`	`10`	`using NpgsqlTypes;`
	`11`	`+using InfiniteTimeout = System.Threading.Timeout;`
`11`	`12`	`using static Npgsql.Util.Statics;`
`12`	`13`
`13`	`14`	`namespace Npgsql;`
`@@ -55,8 +56,9 @@ public TimeSpan Timeout`
`55`	`56`	`{`
`56`	`57`	`set`
`57`	`58`	`{`
`58`		`- _buf.Timeout = value;`
`59`		`- _connector.ReadBuffer.Timeout = value;`
	`59`	`+ var timeout = value > TimeSpan.Zero ? value : InfiniteTimeout.InfiniteTimeSpan;`
	`60`	`+ _buf.Timeout = timeout;`
	`61`	`+ _connector.ReadBuffer.Timeout = timeout;`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using Microsoft.Extensions.Logging;`
`7`	`7`	`using Npgsql.BackendMessages;`
`8`	`8`	`using Npgsql.Internal;`
	`9`	`+using InfiniteTimeout = System.Threading.Timeout;`
`9`	`10`	`using static Npgsql.Util.Statics;`
`10`	`11`
`11`	`12`	`#pragma warning disable 1591`
`@@ -42,12 +43,12 @@ public sealed class NpgsqlRawCopyStream : Stream, ICancelable`
`42`	`43`	`public override int WriteTimeout`
`43`	`44`	`{`
`44`	`45`	`get => (int) _writeBuf.Timeout.TotalMilliseconds;`
`45`		`- set => _writeBuf.Timeout = TimeSpan.FromMilliseconds(value);`
	`46`	`+ set => _writeBuf.Timeout = value > 0 ? TimeSpan.FromMilliseconds(value) : InfiniteTimeout.InfiniteTimeSpan;`
`46`	`47`	`}`
`47`	`48`	`public override int ReadTimeout`
`48`	`49`	`{`
`49`	`50`	`get => (int) _readBuf.Timeout.TotalMilliseconds;`
`50`		`- set => _readBuf.Timeout = TimeSpan.FromMilliseconds(value);`
	`51`	`+ set => _readBuf.Timeout = value > 0 ? TimeSpan.FromMilliseconds(value) : InfiniteTimeout.InfiniteTimeSpan;`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`/// <summary>`