fix #562 write Content-Length 0 for non GET/HEAD requests that have no body

Author: Mpdreamz

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -71,46 +71,46 @@ public virtual ElasticsearchResponse<Stream> DeleteSync(Uri uri, byte[] data, IR
 
 		private ElasticsearchResponse<Stream> HeaderOnlyRequest(Uri uri, string method, IRequestConnectionConfiguration requestSpecificConfig)
 		{
-			var r = this.CreateHttpWebRequest(uri, method, requestSpecificConfig);
+			var r = this.CreateHttpWebRequest(uri, method, null, requestSpecificConfig);
 			return this.DoSynchronousRequest(r, requestSpecificConfig: requestSpecificConfig);
 		}
 
 		private ElasticsearchResponse<Stream> BodyRequest(Uri uri, byte[] data, string method, IRequestConnectionConfiguration requestSpecificConfig)
 		{
-			var r = this.CreateHttpWebRequest(uri, method, requestSpecificConfig);
+			var r = this.CreateHttpWebRequest(uri, method, data, requestSpecificConfig);
 			return this.DoSynchronousRequest(r, data, requestSpecificConfig);
 		}
 
 		public virtual Task<ElasticsearchResponse<Stream>> Get(Uri uri, IRequestConnectionConfiguration requestSpecificConfig = null)
 		{
-			var r = this.CreateHttpWebRequest(uri, "GET", requestSpecificConfig);
+			var r = this.CreateHttpWebRequest(uri, "GET", null, requestSpecificConfig);
 			return this.DoAsyncRequest(r, requestSpecificConfig: requestSpecificConfig);
 		}
 		public virtual Task<ElasticsearchResponse<Stream>> Head(Uri uri, IRequestConnectionConfiguration requestSpecificConfig = null)
 		{
-			var r = this.CreateHttpWebRequest(uri, "HEAD", requestSpecificConfig);
+			var r = this.CreateHttpWebRequest(uri, "HEAD", null, requestSpecificConfig);
 			return this.DoAsyncRequest(r, requestSpecificConfig: requestSpecificConfig);
 		}
 		public virtual Task<ElasticsearchResponse<Stream>> Post(Uri uri, byte[] data, IRequestConnectionConfiguration requestSpecificConfig = null)
 		{
-			var r = this.CreateHttpWebRequest(uri, "POST", requestSpecificConfig);
+			var r = this.CreateHttpWebRequest(uri, "POST", data, requestSpecificConfig);
 			return this.DoAsyncRequest(r, data, requestSpecificConfig: requestSpecificConfig);
 		}
 
 		public virtual Task<ElasticsearchResponse<Stream>> Put(Uri uri, byte[] data, IRequestConnectionConfiguration requestSpecificConfig = null)
 		{
-			var r = this.CreateHttpWebRequest(uri, "PUT", requestSpecificConfig);
+			var r = this.CreateHttpWebRequest(uri, "PUT", data, requestSpecificConfig);
 			return this.DoAsyncRequest(r, data, requestSpecificConfig: requestSpecificConfig);
 		}
 
 		public virtual Task<ElasticsearchResponse<Stream>> Delete(Uri uri, byte[] data, IRequestConnectionConfiguration requestSpecificConfig = null)
 		{
-			var r = this.CreateHttpWebRequest(uri, "DELETE", requestSpecificConfig);
+			var r = this.CreateHttpWebRequest(uri, "DELETE", data, requestSpecificConfig);
 			return this.DoAsyncRequest(r, data, requestSpecificConfig: requestSpecificConfig);
 		}
 		public virtual Task<ElasticsearchResponse<Stream>> Delete(Uri uri, IRequestConnectionConfiguration requestSpecificConfig = null)
 		{
-			var r = this.CreateHttpWebRequest(uri, "DELETE", requestSpecificConfig);
+			var r = this.CreateHttpWebRequest(uri, "DELETE", null, requestSpecificConfig);
 			return this.DoAsyncRequest(r, requestSpecificConfig: requestSpecificConfig);
 		}
 
@@ -127,9 +127,9 @@ private static void ThreadTimeoutCallback(object state, bool timedOut)
 		}
 
 
-		protected virtual HttpWebRequest CreateHttpWebRequest(Uri uri, string method, IRequestConnectionConfiguration requestSpecificConfig)
+		protected virtual HttpWebRequest CreateHttpWebRequest(Uri uri, string method, byte[] data, IRequestConnectionConfiguration requestSpecificConfig)
 		{
-			var myReq = this.CreateWebRequest(uri, method, requestSpecificConfig);
+			var myReq = this.CreateWebRequest(uri, method, data, requestSpecificConfig);
 			this.SetBasicAuthorizationIfNeeded(myReq);
 			this.SetProxyIfNeeded(myReq);
 			return myReq;
@@ -160,7 +160,7 @@ private void SetBasicAuthorizationIfNeeded(HttpWebRequest myReq)
 			//}
 		}
 
-		protected virtual HttpWebRequest CreateWebRequest(Uri uri, string method, IRequestConnectionConfiguration requestSpecificConfig)
+		protected virtual HttpWebRequest CreateWebRequest(Uri uri, string method, byte[] data, IRequestConnectionConfiguration requestSpecificConfig)
 		{
 			//TODO append global querystring
 			//var url = this._CreateUriString(path);
@@ -178,6 +178,14 @@ protected virtual HttpWebRequest CreateWebRequest(Uri uri, string method, IReque
 			myReq.Timeout = timeout; // 1 minute timeout.
 			myReq.ReadWriteTimeout = timeout; // 1 minute timeout.
 			myReq.Method = method;
+
+			//WebRequest won't send Content-Length: 0 for empty bodies
+			//which goes against RFC's and might break i.e IIS when used as a proxy.
+			//see: https://github.com/elasticsearch/elasticsearch-net/issues/562
+			var m = method.ToLower();
+			if (m != "head" && m != "get" && (data == null || data.Length == 0))
+				myReq.ContentLength = 0;
+
 			return myReq;
 		}
 

src/Profiling/Profiling.Indexing/Program.cs

@@ -24,8 +24,12 @@ static void Main(string[] args)
 			var baseThreadCount = process.Threads.Count;
 			var baseMemorySize = process.VirtualMemorySize64;
 
+			var client = new ElasticClient(new ConnectionSettings(new Uri("http://ipv4.fiddler:9200"), "nest-default-index"));
 			//warmer
 			RunTest<HttpTester>(HTTP_PORT, 10);
+
+			client.Refresh();
+
 			Console.WriteLine("Warmed up caches press any key to index {0} messages", NUM_MESSAGES);
 			Console.ReadLine();
 			ConsoleKeyInfo key;
@@ -36,7 +40,6 @@ static void Main(string[] args)
 
 			RunIndex(baseThreadCount, baseMemorySize);
 
-			var client = new ElasticClient(new ConnectionSettings(new Uri("http://localhost:9200"), "nest-default-index"));
 			client.DeleteIndex(d => d.Index(INDEX_PREFIX + "*"));
 
 		}

src/Tests/Nest.Tests.Unit/Core/Domain/Connection/ConnectionTests.cs

@@ -16,7 +16,7 @@ public TestConnection(IConnectionSettingsValues settings)
 
 		public HttpWebRequest GetConnection(string path, string method)
 		{
-			return base.CreateHttpWebRequest(new Uri(new Uri("http://localhost"), path), method, null);
+			return base.CreateHttpWebRequest(new Uri(new Uri("http://localhost"), path), method, null, null);
 		}
 	}