|
14 | 14 |
|
15 | 15 | using RestSharp.Extensions; |
16 | 16 |
|
| 17 | +// ReSharper disable PossiblyMistakenUseOfCancellationToken |
| 18 | + |
17 | 19 | namespace RestSharp; |
18 | 20 |
|
19 | 21 | public partial class RestClient { |
@@ -145,21 +147,26 @@ async Task<HttpResponse> ExecuteRequestAsync(RestRequest request, CancellationTo |
145 | 147 |
|
146 | 148 | // Parse all the cookies from the response and update the cookie jar with cookies |
147 | 149 | if (responseMessage.Headers.TryGetValues(KnownHeaders.SetCookie, out var cookiesHeader)) { |
148 | | - // ReSharper disable once PossibleMultipleEnumeration |
149 | | - cookieContainer.AddCookies(url, cookiesHeader); |
150 | | - // ReSharper disable once PossibleMultipleEnumeration |
151 | | - Options.CookieContainer?.AddCookies(url, cookiesHeader); |
| 150 | + try { |
| 151 | + // ReSharper disable once PossibleMultipleEnumeration |
| 152 | + cookieContainer.AddCookies(url, cookiesHeader); |
| 153 | + // ReSharper disable once PossibleMultipleEnumeration |
| 154 | + Options.CookieContainer?.AddCookies(url, cookiesHeader); |
| 155 | + } |
| 156 | + catch (CookieException) when (!Options.IgnoreInvalidCookies) { |
| 157 | + throw; |
| 158 | + } |
152 | 159 | } |
153 | 160 | } |
154 | 161 | catch (Exception ex) { |
155 | | - return new HttpResponse(null, url, null, ex, timeoutCts.Token); |
| 162 | + return new(null, url, null, ex, timeoutCts.Token); |
156 | 163 | } |
157 | 164 |
|
158 | 165 | #pragma warning disable CS0618 // Type or member is obsolete |
159 | 166 | if (request.OnAfterRequest != null) await request.OnAfterRequest(responseMessage).ConfigureAwait(false); |
160 | 167 | #pragma warning restore CS0618 // Type or member is obsolete |
161 | 168 | await OnAfterHttpRequest(request, responseMessage, cancellationToken).ConfigureAwait(false); |
162 | | - return new HttpResponse(responseMessage, url, cookieContainer, null, timeoutCts.Token); |
| 169 | + return new(responseMessage, url, cookieContainer, null, timeoutCts.Token); |
163 | 170 | } |
164 | 171 |
|
165 | 172 | static async ValueTask OnBeforeRequest(RestRequest request, CancellationToken cancellationToken) { |
|
0 commit comments