huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More var.

This commit is contained in:
Chris Ross 2014-08-04 12:28:20 -07:00
parent ed38d28db4
commit 9e950fba27
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Microsoft.AspNet.TestHost/ClientHandler.cs
View File

@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.Contracts; using System.Diagnostics.Contracts;
using System.IO; using System.IO;
@ -57,18 +56,18 @@ namespace Microsoft.AspNet.TestHost
} }
var state = new RequestState(request, cancellationToken); var state = new RequestState(request, cancellationToken);
HttpContent requestContent = request.Content ?? new StreamContent(Stream.Null); var requestContent = request.Content ?? new StreamContent(Stream.Null);
Stream body = await requestContent.ReadAsStreamAsync(); var body = await requestContent.ReadAsStreamAsync();
if (body.CanSeek) if (body.CanSeek)
{ {
// This body may have been consumed before, rewind it. // This body may have been consumed before, rewind it.
body.Seek(0, SeekOrigin.Begin); body.Seek(0, SeekOrigin.Begin);
} }
state.HttpContext.Request.Body = body; state.HttpContext.Request.Body = body;
CancellationTokenRegistration registration = cancellationToken.Register(state.Abort); var registration = cancellationToken.Register(state.Abort);
// Async offload, don't let the test code block the caller. // Async offload, don't let the test code block the caller.
Task offload = Task.Factory.StartNew(async () => var offload = Task.Factory.StartNew(async () =>
{ {
try try
{ {
@ -128,7 +127,7 @@ namespace Microsoft.AspNet.TestHost
{ {
serverRequest.Headers.AppendValues(header.Key, header.Value.ToArray()); serverRequest.Headers.AppendValues(header.Key, header.Value.ToArray());
} }
HttpContent requestContent = request.Content; var requestContent = request.Content;
if (requestContent != null) if (requestContent != null)
{ {
foreach (var header in request.Content.Headers) foreach (var header in request.Content.Headers)
@ -155,7 +154,7 @@ namespace Microsoft.AspNet.TestHost
{ {
if (!_responseTcs.Task.IsCompleted) if (!_responseTcs.Task.IsCompleted)
{ {
HttpResponseMessage response = GenerateResponse(); var response = GenerateResponse();
// Dispatch, as TrySetResult will synchronously execute the waiters callback and block our Write. // Dispatch, as TrySetResult will synchronously execute the waiters callback and block our Write.
Task.Factory.StartNew(() => _responseTcs.TrySetResult(response)); Task.Factory.StartNew(() => _responseTcs.TrySetResult(response));
} }