Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change ChunkedInputStream to not block right after chunk is read #2332

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change ChunkedInputStream to not block right after chunk is read #2332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 13 additions & 7 deletions http/vibe/http/common.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ final class ChunkedInputStream : InputStream
private {
InterfaceProxy!InputStream m_in;
ulong m_bytesInCurrentChunk = 0;
bool m_chunkHeaderRead;
}

deprecated("Use createChunkedInputStream() instead.")
Expand All @@ -395,15 +396,20 @@ final class ChunkedInputStream : InputStream
{
assert(!!stream);
m_in = stream;
readChunk();
}

@property bool empty() const { return m_bytesInCurrentChunk == 0; }
@property bool empty() { return bytesInCurrentChunk == 0; }

@property ulong leastSize() const { return m_bytesInCurrentChunk; }
@property ulong leastSize() { return bytesInCurrentChunk; }

@property bool dataAvailableForRead() { return m_bytesInCurrentChunk > 0 && m_in.dataAvailableForRead; }

private @property bytesInCurrentChunk()
{
if (!m_chunkHeaderRead) readChunk();
return m_bytesInCurrentChunk;
}

const(ubyte)[] peek()
{
auto dt = m_in.peek();
Expand All @@ -416,21 +422,20 @@ final class ChunkedInputStream : InputStream
size_t nbytes = 0;

while (dst.length > 0) {
enforceBadRequest(m_bytesInCurrentChunk > 0, "Reading past end of chunked HTTP stream.");
enforceBadRequest(bytesInCurrentChunk > 0, "Reading past end of chunked HTTP stream.");

auto sz = cast(size_t)min(m_bytesInCurrentChunk, dst.length);
m_in.read(dst[0 .. sz]);
dst = dst[sz .. $];
m_bytesInCurrentChunk -= sz;
nbytes += sz;

// FIXME: this blocks, but shouldn't for IOMode.once/immediat
if( m_bytesInCurrentChunk == 0 ){
// skip current chunk footer and read next chunk
ubyte[2] crlf;
m_in.read(crlf);
enforceBadRequest(crlf[0] == '\r' && crlf[1] == '\n');
readChunk();
m_chunkHeaderRead = false;
}

if (mode != IOMode.all) break;
Expand All @@ -443,12 +448,13 @@ final class ChunkedInputStream : InputStream

private void readChunk()
{
assert(m_bytesInCurrentChunk == 0);
assert(m_bytesInCurrentChunk == 0 && !m_chunkHeaderRead);
// read chunk header
logTrace("read next chunk header");
auto ln = () @trusted { return cast(string)m_in.readLine(); } ();
logTrace("got chunk header: %s", ln);
m_bytesInCurrentChunk = parse!ulong(ln, 16u);
m_chunkHeaderRead = true;

if( m_bytesInCurrentChunk == 0 ){
// empty chunk denotes the end
Expand Down