Skip to content
Permalink
Browse files

HTTP1 example server: don't crash on empty file served (#962)

Motivation:

The file-io implementation in the example HTTP1 server just crashed on
empty file ;).

Modifications:

- fix the crash
- add integration test

Result:

fewer crashes
  • Loading branch information...
weissi authored and Lukasa committed Apr 10, 2019
1 parent 0179535 commit c90b159b4fd0ea56d4a5f0032d3b85b184032e7e
Showing with 10 additions and 3 deletions.
  1. +6 −3 IntegrationTests/tests_01_http/test_01_get_file.sh
  2. +4 −0 Sources/NIOHTTP1Server/main.swift
@@ -19,8 +19,11 @@ token=$(create_token)
start_server "$token"
htdocs=$(get_htdocs "$token")
echo FOO BAR > "$htdocs/some_file.txt"
for method in sendfile fileio; do
do_curl "$token" "http://foobar.com/$method/some_file.txt" > "$tmp/out.txt"
assert_equal_files "$htdocs/some_file.txt" "$tmp/out.txt"
touch "$htdocs/empty"
for file in some_file.txt empty; do
for method in sendfile fileio; do
do_curl "$token" "http://foobar.com/$method/$file" > "$tmp/out.txt"
assert_equal_files "$htdocs/$file" "$tmp/out.txt"
done
done
stop_server "$token"
@@ -333,6 +333,10 @@ private final class HTTPHandler: ChannelInboundHandler {
case .nonblockingFileIO:
var responseStarted = false
let response = responseHead(request: request, fileRegion: region)
if region.readableBytes == 0 {
responseStarted = true
context.write(self.wrapOutboundOut(.head(response)), promise: nil)
}
return self.fileIO.readChunked(fileRegion: region,
chunkSize: 32 * 1024,
allocator: context.channel.allocator,

0 comments on commit c90b159

Please sign in to comment.
You can’t perform that action at this time.