Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Http/FileSystem/Converters/HttpFileRangedContentStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ out bool isRangeSatisfiable
resStream.SetHeader ( HttpKnownHeaderNames.ContentType, MimeHelper.GetMimeType ( file.Extension ) );
resStream.SetContentLength ( length );

if (request.Method == HttpMethod.Head)
return resStream.Close ();

var buffer = ArrayPool<byte>.Shared.Rent ( ChunkSize );
try {
int read;
Expand Down
37 changes: 37 additions & 0 deletions tests/Sisk.Core/Tests/BugFindingRegressionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
// Repository: https://github.com/sisk-http/core

using System.Net;
using System.Net.Sockets;
using System.Text;
using Sisk.Cadente.CoreEngine;
using Sisk.Core.Entity;
Expand Down Expand Up @@ -140,6 +141,42 @@ public async Task FileServerKeepsPlusSignInPath () {
Assert.AreEqual ( "space", await client.GetStringAsync ( "static/a%20b.txt" ) );
}

[TestMethod]
[DataRow ( false )]
[DataRow ( true )]
public async Task FileServerHeadOnMediaFileDoesNotWriteBody ( bool cadente ) {
string root = Directory.CreateTempSubdirectory ( "sisk-file-head-" ).FullName;
File.WriteAllBytes ( Path.Combine ( root, "v.mp4" ), new byte [ 300_000 ] );

using var host = TestHost.Start (
r => r.Map ( HttpFileServer.CreateServingRoute ( "/static", root ) ),
config => {
if (cadente)
config.Engine = new CadenteHttpServerEngine ();
} );

var baseUri = new Uri ( host.HttpServer.ListeningPrefixes [ 0 ] );
using var cts = new CancellationTokenSource ( TimeSpan.FromSeconds ( 10 ) );
using var tcp = new TcpClient ();
await tcp.ConnectAsync ( baseUri.Host, baseUri.Port, cts.Token );
await using var stream = tcp.GetStream ();

await stream.WriteAsync ( Encoding.ASCII.GetBytes (
$"HEAD /static/v.mp4 HTTP/1.1\r\nHost: {baseUri.Authority}\r\nConnection: close\r\n\r\n" ), cts.Token );

using var received = new MemoryStream ();
await stream.CopyToAsync ( received, cts.Token );
string raw = Encoding.Latin1.GetString ( received.ToArray () );

int headEnd = raw.IndexOf ( "\r\n\r\n", StringComparison.Ordinal );
Assert.IsTrue ( headEnd > 0, raw );

string headHeaders = raw [ ..headEnd ];
StringAssert.StartsWith ( headHeaders, "HTTP/1.1 200" );
StringAssert.Contains ( headHeaders.ToLowerInvariant (), "content-length: 300000" );
Assert.AreEqual ( headEnd + 4, raw.Length );
}

[TestMethod]
[DataRow ( false, true )]
[DataRow ( false, false )]
Expand Down
Loading