Merge branch 'release/8.1.0'

Author: Jericho

Source/HttpMultipartParser/MultipartFormBinaryDataParser.cs

@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace HttpMultipartParser
@@ -201,12 +202,15 @@ public static MultipartFormBinaryDataParser Parse(Stream stream, string boundary
 		/// <param name="ignoreInvalidParts">
 		///     By default the parser will throw an exception if it encounters an invalid part. Set this to true to ignore invalid parts.
 		/// </param>
+		/// <param name="cancellationToken">
+		///     The cancellation token.
+		/// </param>
 		/// <returns>
 		///     A new instance of the <see cref="MultipartFormBinaryDataParser"/> class.
 		/// </returns>
-		public static Task<MultipartFormBinaryDataParser> ParseAsync(Stream stream, Encoding encoding, int binaryBufferSize = Constants.DefaultBufferSize, string[] binaryMimeTypes = null, bool ignoreInvalidParts = false)
+		public static Task<MultipartFormBinaryDataParser> ParseAsync(Stream stream, Encoding encoding, int binaryBufferSize = Constants.DefaultBufferSize, string[] binaryMimeTypes = null, bool ignoreInvalidParts = false, CancellationToken cancellationToken = default)
 		{
-			return ParseAsync(stream, null, encoding, binaryBufferSize, binaryMimeTypes, ignoreInvalidParts);
+			return ParseAsync(stream, null, encoding, binaryBufferSize, binaryMimeTypes, ignoreInvalidParts, cancellationToken);
 		}
 
 		/// <summary>
@@ -233,13 +237,16 @@ public static Task<MultipartFormBinaryDataParser> ParseAsync(Stream stream, Enco
 		/// <param name="ignoreInvalidParts">
 		///     By default the parser will throw an exception if it encounters an invalid part. Set this to true to ignore invalid parts.
 		/// </param>
+		/// <param name="cancellationToken">
+		///     The cancellation token.
+		/// </param>
 		/// <returns>
 		///     A new instance of the <see cref="MultipartFormBinaryDataParser"/> class.
 		/// </returns>
-		public static async Task<MultipartFormBinaryDataParser> ParseAsync(Stream stream, string boundary = null, Encoding encoding = null, int binaryBufferSize = Constants.DefaultBufferSize, string[] binaryMimeTypes = null, bool ignoreInvalidParts = false)
+		public static async Task<MultipartFormBinaryDataParser> ParseAsync(Stream stream, string boundary = null, Encoding encoding = null, int binaryBufferSize = Constants.DefaultBufferSize, string[] binaryMimeTypes = null, bool ignoreInvalidParts = false, CancellationToken cancellationToken = default)
 		{
 			var parser = new MultipartFormBinaryDataParser();
-			await parser.ParseStreamAsync(stream, boundary, encoding, binaryBufferSize, binaryMimeTypes, ignoreInvalidParts).ConfigureAwait(false);
+			await parser.ParseStreamAsync(stream, boundary, encoding, binaryBufferSize, binaryMimeTypes, ignoreInvalidParts, cancellationToken).ConfigureAwait(false);
 			return parser;
 		}
 
@@ -321,7 +328,10 @@ private void ParseStream(Stream stream, string boundary, Encoding encoding, int
 		/// <param name="ignoreInvalidParts">
 		///     By default the parser will throw an exception if it encounters an invalid part. Set this to true to ignore invalid parts.
 		/// </param>
-		private async Task ParseStreamAsync(Stream stream, string boundary, Encoding encoding, int binaryBufferSize, string[] binaryMimeTypes, bool ignoreInvalidParts)
+		/// <param name="cancellationToken">
+		///     The cancellation token.
+		/// </param>
+		private async Task ParseStreamAsync(Stream stream, string boundary, Encoding encoding, int binaryBufferSize, string[] binaryMimeTypes, bool ignoreInvalidParts, CancellationToken cancellationToken)
 		{
 			var desiredEncoding = encoding ?? Constants.DefaultEncoding;
 			var streamingParser = new StreamingBinaryMultipartFormDataParser(stream, boundary, desiredEncoding, binaryBufferSize, binaryMimeTypes, ignoreInvalidParts);
@@ -341,7 +351,7 @@ private async Task ParseStreamAsync(Stream stream, string boundary, Encoding enc
 				Files[Files.Count - 1].Data.Write(buffer, 0, bytes);
 			};
 
-			await streamingParser.RunAsync().ConfigureAwait(false);
+			await streamingParser.RunAsync(cancellationToken).ConfigureAwait(false);
 
 			// Reset all the written memory streams so they can be read.
 			foreach (var file in Files)

Source/HttpMultipartParser/MultipartFormDataParser.cs

@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace HttpMultipartParser
@@ -204,9 +205,12 @@ public static MultipartFormDataParser Parse(Stream stream, string boundary = nul
 		/// <returns>
 		///     A new instance of the <see cref="MultipartFormDataParser"/> class.
 		/// </returns>
-		public static Task<MultipartFormDataParser> ParseAsync(Stream stream, Encoding encoding, int binaryBufferSize = Constants.DefaultBufferSize, string[] binaryMimeTypes = null, bool ignoreInvalidParts = false)
+		/// <param name="cancellationToken">
+		///     The cancellation token.
+		/// </param>
+		public static Task<MultipartFormDataParser> ParseAsync(Stream stream, Encoding encoding, int binaryBufferSize = Constants.DefaultBufferSize, string[] binaryMimeTypes = null, bool ignoreInvalidParts = false, CancellationToken cancellationToken = default)
 		{
-			return ParseAsync(stream, null, encoding, binaryBufferSize, binaryMimeTypes, ignoreInvalidParts);
+			return ParseAsync(stream, null, encoding, binaryBufferSize, binaryMimeTypes, ignoreInvalidParts, cancellationToken);
 		}
 
 		/// <summary>
@@ -233,13 +237,16 @@ public static Task<MultipartFormDataParser> ParseAsync(Stream stream, Encoding e
 		/// <param name="ignoreInvalidParts">
 		///     By default the parser will throw an exception if it encounters an invalid part. Set this to true to ignore invalid parts.
 		/// </param>
+		/// <param name="cancellationToken">
+		///     The cancellation token.
+		/// </param>
 		/// <returns>
 		///     A new instance of the <see cref="MultipartFormDataParser"/> class.
 		/// </returns>
-		public static async Task<MultipartFormDataParser> ParseAsync(Stream stream, string boundary = null, Encoding encoding = null, int binaryBufferSize = Constants.DefaultBufferSize, string[] binaryMimeTypes = null, bool ignoreInvalidParts = false)
+		public static async Task<MultipartFormDataParser> ParseAsync(Stream stream, string boundary = null, Encoding encoding = null, int binaryBufferSize = Constants.DefaultBufferSize, string[] binaryMimeTypes = null, bool ignoreInvalidParts = false, CancellationToken cancellationToken = default)
 		{
 			var parser = new MultipartFormDataParser();
-			await parser.ParseStreamAsync(stream, boundary, encoding, binaryBufferSize, binaryMimeTypes, ignoreInvalidParts).ConfigureAwait(false);
+			await parser.ParseStreamAsync(stream, boundary, encoding, binaryBufferSize, binaryMimeTypes, ignoreInvalidParts, cancellationToken).ConfigureAwait(false);
 			return parser;
 		}
 
@@ -319,7 +326,10 @@ private void ParseStream(Stream stream, string boundary, Encoding encoding, int
 		/// <param name="ignoreInvalidParts">
 		///     By default the parser will throw an exception if it encounters an invalid part. Set this to true to ignore invalid parts.
 		/// </param>
-		private async Task ParseStreamAsync(Stream stream, string boundary, Encoding encoding, int binaryBufferSize, string[] binaryMimeTypes, bool ignoreInvalidParts)
+		/// <param name="cancellationToken">
+		///     The cancellation token.
+		/// </param>
+		private async Task ParseStreamAsync(Stream stream, string boundary, Encoding encoding, int binaryBufferSize, string[] binaryMimeTypes, bool ignoreInvalidParts, CancellationToken cancellationToken)
 		{
 			var desiredEncoding = encoding ?? Constants.DefaultEncoding;
 			var streamingParser = new StreamingBinaryMultipartFormDataParser(stream, boundary, desiredEncoding, binaryBufferSize, binaryMimeTypes, ignoreInvalidParts);
@@ -336,7 +346,7 @@ private async Task ParseStreamAsync(Stream stream, string boundary, Encoding enc
 				Files[Files.Count - 1].Data.Write(buffer, 0, bytes);
 			};
 
-			await streamingParser.RunAsync().ConfigureAwait(false);
+			await streamingParser.RunAsync(cancellationToken).ConfigureAwait(false);
 
 			// Reset all the written memory streams so they can be read.
 			foreach (var file in Files)

build.cake

@@ -1,8 +1,8 @@
 // Install tools.
-#tool dotnet:?package=GitVersion.Tool&version=5.11.1
+#tool dotnet:?package=GitVersion.Tool&version=5.12.0
 #tool dotnet:?package=coveralls.net&version=4.0.1
 #tool nuget:?package=GitReleaseManager&version=0.13.0
-#tool nuget:?package=ReportGenerator&version=5.1.13
+#tool nuget:?package=ReportGenerator&version=5.1.16
 #tool nuget:?package=xunit.runner.console&version=2.4.2
 #tool nuget:?package=Codecov&version=1.13.0
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "7.0.102",
     "rollForward": "latestFeature"
   }
 }