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

Incorporate name changes from HttpAbstractions

This commit is contained in:
Pranav K 2014-05-05 17:20:13 -07:00
parent 89b958b8e6
commit bc31b50b45
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNet.StaticFiles/SendFileMiddleware.cs
View File

@ -51,15 +51,15 @@ namespace Microsoft.AspNet.StaticFiles
public Task Invoke(HttpContext context) public Task Invoke(HttpContext context)
{ {
// Check if there is a SendFile feature already present // Check if there is a SendFile feature already present
if (context.GetFeature<IHttpSendFile>() == null) if (context.GetFeature<IHttpSendFileFeature>() == null)
{ {
context.SetFeature<IHttpSendFile>(new SendFileWrapper(context.Response.Body)); context.SetFeature<IHttpSendFileFeature>(new SendFileWrapper(context.Response.Body));
} }
return _next(context); return _next(context);
} }
private class SendFileWrapper : IHttpSendFile private class SendFileWrapper : IHttpSendFileFeature
{ {
private readonly Stream _output; private readonly Stream _output;

4
src/Microsoft.AspNet.StaticFiles/SendFileResponseExtensions.cs
View File

@ -39,7 +39,7 @@ namespace Microsoft.AspNet.StaticFiles
{ {
throw new ArgumentNullException("response"); throw new ArgumentNullException("response");
} }
return response.HttpContext.GetFeature<IHttpSendFile>() != null; return response.HttpContext.GetFeature<IHttpSendFileFeature>() != null;
} }
/// <summary> /// <summary>
@ -72,7 +72,7 @@ namespace Microsoft.AspNet.StaticFiles
{ {
throw new ArgumentNullException("response"); throw new ArgumentNullException("response");
} }
IHttpSendFile sendFile = response.HttpContext.GetFeature<IHttpSendFile>(); var sendFile = response.HttpContext.GetFeature<IHttpSendFileFeature>();
if (sendFile == null) if (sendFile == null)
{ {
throw new NotSupportedException(Resources.Exception_SendFileNotSupported); throw new NotSupportedException(Resources.Exception_SendFileNotSupported);

4
src/Microsoft.AspNet.StaticFiles/StaticFileContext.cs
View File

@ -331,7 +331,7 @@ namespace Microsoft.AspNet.StaticFiles
ApplyResponseHeaders(Constants.Status200Ok); ApplyResponseHeaders(Constants.Status200Ok);
string physicalPath = _fileInfo.PhysicalPath; string physicalPath = _fileInfo.PhysicalPath;
IHttpSendFile sendFile = _context.GetFeature<IHttpSendFile>(); var sendFile = _context.GetFeature<IHttpSendFileFeature>();
if (sendFile != null && !string.IsNullOrEmpty(physicalPath)) if (sendFile != null && !string.IsNullOrEmpty(physicalPath))
{ {
await sendFile.SendFileAsync(physicalPath, 0, _length, _request.CallCanceled); await sendFile.SendFileAsync(physicalPath, 0, _length, _request.CallCanceled);
@ -377,7 +377,7 @@ namespace Microsoft.AspNet.StaticFiles
ApplyResponseHeaders(Constants.Status206PartialContent); ApplyResponseHeaders(Constants.Status206PartialContent);
string physicalPath = _fileInfo.PhysicalPath; string physicalPath = _fileInfo.PhysicalPath;
IHttpSendFile sendFile = _context.GetFeature<IHttpSendFile>(); var sendFile = _context.GetFeature<IHttpSendFileFeature>();
if (sendFile != null && !string.IsNullOrEmpty(physicalPath)) if (sendFile != null && !string.IsNullOrEmpty(physicalPath))
{ {
await sendFile.SendFileAsync(physicalPath, start, length, _request.CallCanceled); await sendFile.SendFileAsync(physicalPath, start, length, _request.CallCanceled);