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

Merge branch 'benaadams/odd-sync' into dev

This commit is contained in:
Stephen Halter 2015-11-12 16:47:27 -08:00
parent 8ad7b7125a 344c821f83
commit 6b995362f1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNet.Server.Kestrel/Http/Frame.FeatureCollection.cs
View File

@ -277,7 +277,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
OnCompleted(callback, state); OnCompleted(callback, state);
} }
Task<Stream> IHttpUpgradeFeature.UpgradeAsync() async Task<Stream> IHttpUpgradeFeature.UpgradeAsync()
{ {
StatusCode = 101; StatusCode = 101;
ReasonPhrase = "Switching Protocols"; ReasonPhrase = "Switching Protocols";
@ -290,8 +290,10 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
ResponseHeaders["Upgrade"] = values; ResponseHeaders["Upgrade"] = values;
} }
} }
ProduceStartAndFireOnStarting(immediate: true).GetAwaiter().GetResult();
return Task.FromResult(DuplexStream); await ProduceStartAndFireOnStarting(immediate: true);
return DuplexStream;
} }
IEnumerator<KeyValuePair<Type, object>> IEnumerable<KeyValuePair<Type, object>>.GetEnumerator() => FastEnumerable().GetEnumerator(); IEnumerator<KeyValuePair<Type, object>> IEnumerable<KeyValuePair<Type, object>>.GetEnumerator() => FastEnumerable().GetEnumerator();