fix #953 gziped responses caused the HttpClient connection to not read the response stream, also added missing Accept-Encoding headers

Author: Mpdreamz

src/Connections/Elasticsearch.Net.Connection.HttpClient/HttpClientConnection.cs

@@ -38,9 +38,6 @@ public HttpClientConnection(IConnectionConfigurationValues settings, HttpClientH
 
 			var innerHandler = handler ?? new WebRequestHandler();
 
-			if (settings.EnableCompressedResponses)
-				innerHandler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-
 			if (innerHandler.SupportsProxy && !string.IsNullOrWhiteSpace(_settings.ProxyAddress))
 			{
 				innerHandler.Proxy = new WebProxy(_settings.ProxyAddress)
@@ -56,6 +53,12 @@ public HttpClientConnection(IConnectionConfigurationValues settings, HttpClientH
 			{
 				Timeout = TimeSpan.FromMilliseconds(_settings.Timeout)
 			};
+			if (settings.EnableCompressedResponses && innerHandler.SupportsAutomaticDecompression)
+			{
+				innerHandler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+				Client.DefaultRequestHeaders.AcceptEncoding.Add(new StringWithQualityHeaderValue("gzip"));
+				Client.DefaultRequestHeaders.AcceptEncoding.Add(new StringWithQualityHeaderValue("deflate"));
+			}
 
 		}
 
@@ -126,7 +129,6 @@ public async Task<ElasticsearchResponse<Stream>> DoRequest(HttpMethod method, Ur
 				else if (!string.IsNullOrWhiteSpace(DefaultContentType))
 					request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(DefaultContentType));
 
-
 				if (!string.IsNullOrEmpty(uri.UserInfo))
 				{
 					request.Headers.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes(uri.UserInfo)));
@@ -141,7 +143,7 @@ public async Task<ElasticsearchResponse<Stream>> DoRequest(HttpMethod method, Ur
 
 				var response = await Client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
 
-				if (method == HttpMethod.Head || response.Content == null || !response.Content.Headers.ContentLength.HasValue || response.Content.Headers.ContentLength.Value <= 0)
+				if (method == HttpMethod.Head || response.Content == null)
 				{
 					return ElasticsearchResponse<Stream>.Create(_settings, (int)response.StatusCode, method.ToString().ToLowerInvariant(), uri.ToString(), data);
 				}

src/Tests/Nest.Tests.Integration/ElasticsearchConfiguration.cs

@@ -32,7 +32,7 @@ public static Uri CreateBaseUri(int? port = null)
 		{
 			var host = Host;
 			if (port != 9500 && Process.GetProcessesByName("fiddler").HasAny())
-				host = "localhost.fiddler";
+				host = "ipv4.fiddler";
 
 			var uri = new UriBuilder("http", host, port.GetValueOrDefault(9200)).Uri;
 			return uri;

src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj

@@ -66,6 +66,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -175,6 +176,7 @@
     <Compile Include="Indices\StatsTests.cs" />
     <Compile Include="Core\AsyncTests.cs" />
     <Compile Include="Mapping\MappingVisitorTests.cs" />
+    <Compile Include="Reproduce\Reproduce953Tests.cs" />
     <Compile Include="Reproduce\Reproduce945Tests.cs" />
     <Compile Include="Reproduce\Reproduce769Tests.cs" />
     <Compile Include="Search\Filter\AndOrNotFilterTests.cs" />
@@ -249,6 +251,10 @@
     <Compile Include="Warmers\WarmersTests.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Connections\Elasticsearch.Net.Connection.HttpClient\Elasticsearch.Net.Connection.HttpClient.csproj">
+      <Project>{a69322fd-b874-44ef-abe0-63f4a7b5593e}</Project>
+      <Name>Elasticsearch.Net.Connection.HttpClient</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Elasticsearch.Net\Elasticsearch.Net.csproj">
       <Project>{e97ccf40-0ba6-43fe-9f2d-58d454134088}</Project>
       <Name>Elasticsearch.Net</Name>

src/Tests/Nest.Tests.Integration/Reproduce/Reproduce953Tests.cs

@@ -0,0 +1,35 @@
+using System.Text;
+using Elasticsearch.Net.Connection;
+using Elasticsearch.Net.ConnectionPool;
+using FluentAssertions;
+using Nest.Tests.Integration;
+using Nest.Tests.MockData;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Nest.Tests.Integration.Reproduce
+{
+	[TestFixture]
+	public class Reproduce953Tests 
+	{
+		[Test]
+		public void Calling_Refresh_UsingHttpClientConnection_DoesNotThrow()
+		{
+
+			var settings = ElasticsearchConfiguration.Settings()
+				.EnableCompressedResponses(true);
+			var connection = new HttpClientConnection(settings);
+			var client = new ElasticClient(settings, connection: connection);
+			
+			Assert.DoesNotThrow(()=> client.Refresh());
+			Assert.DoesNotThrow(()=> client.Get<ElasticsearchProject>(NestTestData.Data.First().Id));
+			Assert.DoesNotThrow(()=> client.Ping());
+
+		}
+		
+		
+	}
+}