Merge pull request #176 from JamesSinclairBiomni/master

- fix for #173

Author: dougbu

src/System.Web.Http/Batch/DefaultHttpBatchHandler.cs

@@ -187,7 +187,7 @@ public virtual async Task<IList<HttpRequestMessage>> ParseBatchRequestsAsync(Htt
             foreach (HttpContent httpContent in streamProvider.Contents)
             {
                 cancellationToken.ThrowIfCancellationRequested();
-                HttpRequestMessage innerRequest = await httpContent.ReadAsHttpRequestMessageAsync();
+                HttpRequestMessage innerRequest = request.RequestUri == null ? await httpContent.ReadAsHttpRequestMessageAsync() : await httpContent.ReadAsHttpRequestMessageAsync(request.RequestUri.Scheme);
                 innerRequest.CopyBatchRequestProperties(request);
                 requests.Add(innerRequest);
             }

test/System.Web.Http.Test/Batch/DefaultHttpBatchHandlerTest.cs

@@ -281,6 +281,29 @@ public async Task ParseBatchRequestsAsync_Returns_RequestsFromMultipartContent()
             Assert.Equal("http://example.com/values", requests[1].RequestUri.AbsoluteUri);
         }
 
+        [Fact]
+        public async Task ParseBatchRequestsAsync_Returns_RequestsFromMultipartContent_WithUriSchemeSet_FromRequest()
+        {
+            DefaultHttpBatchHandler batchHandler = new DefaultHttpBatchHandler(new HttpServer());
+            HttpRequestMessage request = new HttpRequestMessage
+            {
+                Content = new MultipartContent("mixed")
+                {
+                    new HttpMessageContent(new HttpRequestMessage(HttpMethod.Get, "http://example.com/")),
+                    new HttpMessageContent(new HttpRequestMessage(HttpMethod.Post, "https://example.com/values"))
+                },
+                RequestUri = new Uri("https://example.com/")
+            };
+
+            IList<HttpRequestMessage> requests = await batchHandler.ParseBatchRequestsAsync(request, CancellationToken.None);
+
+            Assert.Equal(2, requests.Count);
+            Assert.Equal(HttpMethod.Get, requests[0].Method);
+            Assert.Equal("https://example.com/", requests[0].RequestUri.AbsoluteUri);
+            Assert.Equal(HttpMethod.Post, requests[1].Method);
+            Assert.Equal("https://example.com/values", requests[1].RequestUri.AbsoluteUri);
+        }
+
         [Fact]
         public async Task ParseBatchRequestsAsync_CopiesPropertiesFromRequest_WithoutExcludedProperties()
         {