From 676feccfc630b01167f0edf367ef6a1787c5060b Mon Sep 17 00:00:00 2001 From: Alberto Monteiro Date: Wed, 8 Apr 2020 12:33:31 -0300 Subject: [PATCH 1/4] Handling empty Content-Encoding header Fixes #217 --- Core/Requests/ServiceRequestBase.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Core/Requests/ServiceRequestBase.cs b/Core/Requests/ServiceRequestBase.cs index 7eec18a0..ae067ca6 100644 --- a/Core/Requests/ServiceRequestBase.cs +++ b/Core/Requests/ServiceRequestBase.cs @@ -108,6 +108,10 @@ protected static Stream GetResponseStream(IEwsHttpWebResponse response, int read private static Stream WrapStream(Stream responseStream, string contentEncoding) { + if (contentEncoding == null) + { + return responseStream; + } if (contentEncoding.ToLowerInvariant().Contains("gzip")) { return new GZipStream(responseStream, CompressionMode.Decompress); @@ -933,4 +937,4 @@ private void ReadXmlDeclaration(EwsServiceXmlReader reader) #endregion } -} \ No newline at end of file +} From 35b46ae66f0c3bbe5f18071b393513d8e7df4db9 Mon Sep 17 00:00:00 2001 From: Alberto Monteiro Date: Thu, 9 Apr 2020 14:35:19 -0300 Subject: [PATCH 2/4] PR Review fixes --- Core/Requests/ServiceRequestBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Requests/ServiceRequestBase.cs b/Core/Requests/ServiceRequestBase.cs index ae067ca6..26a4c80c 100644 --- a/Core/Requests/ServiceRequestBase.cs +++ b/Core/Requests/ServiceRequestBase.cs @@ -108,7 +108,7 @@ protected static Stream GetResponseStream(IEwsHttpWebResponse response, int read private static Stream WrapStream(Stream responseStream, string contentEncoding) { - if (contentEncoding == null) + if (string.IsNullOrWhiteSpace(contentEncoding)) { return responseStream; } From 26d037446ee7e9de54e0ee45958cf70d1f1de940 Mon Sep 17 00:00:00 2001 From: Alberto Monteiro Date: Thu, 9 Apr 2020 14:50:08 -0300 Subject: [PATCH 3/4] Fix build --- Core/Requests/ServiceRequestBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Requests/ServiceRequestBase.cs b/Core/Requests/ServiceRequestBase.cs index 26a4c80c..14a3103a 100644 --- a/Core/Requests/ServiceRequestBase.cs +++ b/Core/Requests/ServiceRequestBase.cs @@ -108,7 +108,7 @@ protected static Stream GetResponseStream(IEwsHttpWebResponse response, int read private static Stream WrapStream(Stream responseStream, string contentEncoding) { - if (string.IsNullOrWhiteSpace(contentEncoding)) + if (string.IsNullOrEmpty(contentEncoding?.Trim())) { return responseStream; } From b256b239c87b66b0551874101e04f4101888973e Mon Sep 17 00:00:00 2001 From: Alberto Monteiro Date: Thu, 9 Apr 2020 14:51:30 -0300 Subject: [PATCH 4/4] Update ServiceRequestBase.cs --- Core/Requests/ServiceRequestBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Requests/ServiceRequestBase.cs b/Core/Requests/ServiceRequestBase.cs index 14a3103a..882e0dad 100644 --- a/Core/Requests/ServiceRequestBase.cs +++ b/Core/Requests/ServiceRequestBase.cs @@ -108,7 +108,7 @@ protected static Stream GetResponseStream(IEwsHttpWebResponse response, int read private static Stream WrapStream(Stream responseStream, string contentEncoding) { - if (string.IsNullOrEmpty(contentEncoding?.Trim())) + if (string.IsNullOrEmpty(contentEncoding)) { return responseStream; }