Fix merge

tmds · tmds · commit efec0feda274 · 2015-11-18T08:29:30.000+01:00
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Frame.cs
@@ -144,7 +144,7 @@ public void Reset()
                 httpConnectionFeature.IsLocal = false;
             }
 
-            _connectionFilter?.PrepareRequest(this);
+            _prepareRequest?.Invoke(this);
 
             _requestAbortCts?.Dispose();
         }

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public void Reset()`
`144`	`144`	`httpConnectionFeature.IsLocal = false;`
`145`	`145`	`}`
`146`	`146`
`147`		`- _connectionFilter?.PrepareRequest(this);`
	`147`	`+ _prepareRequest?.Invoke(this);`
`148`	`148`
`149`	`149`	`_requestAbortCts?.Dispose();`
`150`	`150`	`}`