Skip to content
This repository was archived by the owner on Mar 19, 2019. It is now read-only.

Fix issue reading empty known headers #423

Merged
merged 1 commit into from
Jan 17, 2018
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
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ internal string GetKnownHeader(HttpSysRequestHeader header)
HttpApi.HTTP_KNOWN_HEADER* pKnownHeader = (&request->Headers.KnownHeaders) + headerIndex;
// For known headers, when header value is empty, RawValueLength will be 0 and
// pRawValue will point to empty string ("\0")
if (pKnownHeader->pRawValue != null)
if (pKnownHeader->RawValueLength > 0)
{
value = HeaderEncoding.GetString(pKnownHeader->pRawValue + fixup, pKnownHeader->RawValueLength);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,56 @@ public async Task RequestHeaders_ClientSendsUtf8Headers_Success()
}
}

[ConditionalFact]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You included Linq in your last PR: https://github.com/aspnet/HttpSysServer/pull/401/files#diff-2e2f490c4dbd4e72ad07b40f9a1d20bcR6. Was that a mistake or do you actually need it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting. This PR didn't need it. I may have forgotten to clean it up in the last PR.

public async Task RequestHeaders_ClientSendsKnownHeaderWithNoValue_Success()
{
string address;
using (var server = Utilities.CreateHttpServer(out address))
{
string[] customValues = new string[] { "" };
Task responseTask = SendRequestAsync(address, "If-None-Match", customValues);

var context = await server.AcceptAsync(Utilities.DefaultTimeout);
var requestHeaders = context.Request.Headers;
Assert.Equal(3, requestHeaders.Count);
Assert.Equal(new Uri(address).Authority, requestHeaders["Host"]);
Assert.Equal(new[] { new Uri(address).Authority }, requestHeaders.GetValues("Host"));
Assert.Equal("close", requestHeaders["Connection"]);
Assert.Equal(new[] { "close" }, requestHeaders.GetValues("Connection"));
Assert.Equal(StringValues.Empty, requestHeaders["If-None-Match"]);
Assert.Empty(requestHeaders.GetValues("If-None-Match"));
Assert.Equal("spacervalue", requestHeaders["Spacer-Header"]);
context.Dispose();

await responseTask;
}
}

[ConditionalFact]
public async Task RequestHeaders_ClientSendsUnknownHeaderWithNoValue_Success()
{
string address;
using (var server = Utilities.CreateHttpServer(out address))
{
string[] customValues = new string[] { "" };
Task responseTask = SendRequestAsync(address, "Custom-Header", customValues);

var context = await server.AcceptAsync(Utilities.DefaultTimeout);
var requestHeaders = context.Request.Headers;
Assert.Equal(4, requestHeaders.Count);
Assert.Equal(new Uri(address).Authority, requestHeaders["Host"]);
Assert.Equal(new[] { new Uri(address).Authority }, requestHeaders.GetValues("Host"));
Assert.Equal("close", requestHeaders["Connection"]);
Assert.Equal(new[] { "close" }, requestHeaders.GetValues("Connection"));
Assert.Equal("", requestHeaders["Custom-Header"]);
Assert.Empty(requestHeaders.GetValues("Custom-Header"));
Assert.Equal("spacervalue", requestHeaders["Spacer-Header"]);
context.Dispose();

await responseTask;
}
}

private async Task<string> SendRequestAsync(string uri)
{
using (HttpClient client = new HttpClient())
Expand Down