Merge remote-tracking branch 'origin/dev' into dev

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Todd Menier
+Copyright (c) 2022 Todd Menier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Test/Flurl.Test/UrlBuilder/UrlParsingTests.cs

@@ -115,5 +115,13 @@ public void does_not_alter_url_passed_to_constructor() {
 			var url = new Url(expected);
 			Assert.AreEqual(expected, url.ToString());
 		}
+
+		[Test] // #656
+		public void queryparams_uses_equals() {
+			var url = new Url("http://www.mysite.com?param=1");
+			// String gets boxed, so we need to use Equals, instead of ==
+			var contains = url.QueryParams.Contains("param", "1");
+			Assert.IsTrue(contains);
+		}
 	}
 }

src/Flurl.Http/Content/CapturedMultipartContent.cs

@@ -31,6 +31,25 @@ public CapturedMultipartContent(FlurlHttpSettings settings = null) : base("form-
 			_settings = settings ?? FlurlHttp.GlobalSettings;
 		}
 
+		/// <summary>
+		/// Initializes a new instance of the <see cref="CapturedMultipartContent"/> class.
+		/// </summary>
+		/// <param name="subtype">The subtype of the multipart content.</param>
+		/// <param name="settings">The FlurlHttpSettings used to serialize each content part. (Defaults to FlurlHttp.GlobalSettings.)</param>
+		public CapturedMultipartContent(string subtype, FlurlHttpSettings settings = null) : base(subtype) {
+			_settings = settings ?? FlurlHttp.GlobalSettings;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="CapturedMultipartContent"/> class.
+		/// </summary>
+		/// <param name="subtype">The subtype of the multipart content.</param>
+		/// <param name="boundary">The boundary string for the multipart content.</param>
+		/// <param name="settings">The FlurlHttpSettings used to serialize each content part. (Defaults to FlurlHttp.GlobalSettings.)</param>
+		public CapturedMultipartContent(string subtype, string boundary, FlurlHttpSettings settings = null) : base(subtype, boundary) {
+			_settings = settings ?? FlurlHttp.GlobalSettings;
+		}
+
 		/// <summary>
 		/// Add a content part to the multipart request.
 		/// </summary>

src/Flurl.Http/FlurlRequest.cs

@@ -106,7 +106,7 @@ public FlurlHttpSettings Settings {
 
 		/// <inheritdoc />
 		public IFlurlClient Client {
-			get => 
+			get =>
 				(_client != null) ? _client :
 				(Url != null) ? FlurlHttp.GlobalSettings.FlurlClientFactory.Get(Url) :
 				null;
@@ -205,7 +205,7 @@ public async Task<IFlurlResponse> SendAsync(HttpMethod verb, HttpContent content
 
 		private void SyncHeaders(HttpRequestMessage request) {
 			// copy any client-level (default) headers to this request
-			foreach (var header in Client.Headers.Where(h => !this.Headers.Contains(h.Name)))
+			foreach (var header in Client.Headers.Where(h => !this.Headers.Contains(h.Name)).ToList())
 				this.Headers.Add(header.Name, header.Value);
 
 			// copy headers from FlurlRequest to HttpRequestMessage

src/Flurl/QueryParamCollection.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -56,7 +55,7 @@ public void Add(string name, object value, bool isEncoded = false, NullValueHand
 				return;
 			}
 
-			foreach (var val in SplitCollection(value)) {
+			foreach (var val in SplitCollection(value).ToList()) {
 				if (val == null && nullValueHandling != NullValueHandling.NameOnly)
 					continue;
 				_values.Add(name, new QueryParamValue(val, isEncoded));
@@ -81,7 +80,6 @@ public void AddOrReplace(string name, object value, bool isEncoded = false, Null
 			// example: x has values at positions 2 and 4 in the query string, then we set x to
 			// an array of 4 values. We want to replace the values at positions 2 and 4 with the
 			// first 2 values of the new array, then append the remaining 2 values to the end.
-			//var parameters = this.Where(p => p.Name == name).ToArray();
 			var values = new Queue<object>(SplitCollection(value));
 
 			var old = _values.ToArray();
@@ -93,7 +91,7 @@ public void AddOrReplace(string name, object value, bool isEncoded = false, Null
 					continue;
 				}
 
-				if (!values.Any())
+				if (values.Count == 0)
 					continue; // remove, effectively
 
 				var val = values.Dequeue();
@@ -106,7 +104,7 @@ public void AddOrReplace(string name, object value, bool isEncoded = false, Null
 			}
 
 			// add the rest to the end
-			while (values.Any()) {
+			while (values.Count > 0) {
 				Add(name, values.Dequeue(), isEncoded, nullValueHandling);
 			}
 		}
@@ -117,7 +115,7 @@ private IEnumerable<object> SplitCollection(object value) {
 			else if (value is string s)
 				yield return s;
 			else if (value is IEnumerable en) {
-				foreach (var item in en.Cast<object>().SelectMany(SplitCollection))
+				foreach (var item in en.Cast<object>().SelectMany(SplitCollection).ToList())
 					yield return item;
 			}
 			else
@@ -163,7 +161,7 @@ public bool TryGetFirst(string name, out object value) {
 		public bool Contains(string name) => _values.Contains(name);
 
 		/// <inheritdoc />>
-		public bool Contains(string name, object value) => _values.Any(qv => qv.Name == name && qv.Value.Value == value);
+		public bool Contains(string name, object value) => _values.Any(qv => qv.Name == name && qv.Value.Value.Equals(value));
 	}
 
 	/// <summary>