diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-07-01 12:24:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 12:24:26 -0400 |
| commit | ff3713153ad2317e1c196f33ac2cba61b449a00e (patch) | |
| tree | 84d2e6ed5bcb556a2395603b6403c8e992535e6b /SocketHttpListener/Net/ChunkStream.cs | |
| parent | fad71a6c7d12c8b207cdf473c7dd7daafa53c174 (diff) | |
| parent | 2dcad6b5977f5c5be81b18c42506ed8ad3fb73b6 (diff) | |
Merge pull request #2739 from MediaBrowser/beta
Beta
Diffstat (limited to 'SocketHttpListener/Net/ChunkStream.cs')
| -rw-r--r-- | SocketHttpListener/Net/ChunkStream.cs | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/SocketHttpListener/Net/ChunkStream.cs b/SocketHttpListener/Net/ChunkStream.cs index 2de6c2c18..b41285dbc 100644 --- a/SocketHttpListener/Net/ChunkStream.cs +++ b/SocketHttpListener/Net/ChunkStream.cs @@ -79,12 +79,6 @@ namespace SocketHttpListener.Net private int _trailerState; private List<Chunk> _chunks; - public ChunkStream(byte[] buffer, int offset, int size, WebHeaderCollection headers) - : this(headers) - { - Write(buffer, offset, size); - } - public ChunkStream(WebHeaderCollection headers) { _headers = headers; @@ -102,13 +96,6 @@ namespace SocketHttpListener.Net _chunks.Clear(); } - public void WriteAndReadBack(byte[] buffer, int offset, int size, ref int read) - { - if (offset + read > 0) - Write(buffer, offset, offset + read); - read = Read(buffer, offset, size); - } - public int Read(byte[] buffer, int offset, int size) { return ReadFromChunks(buffer, offset, size); @@ -143,6 +130,9 @@ namespace SocketHttpListener.Net public void Write(byte[] buffer, int offset, int size) { + // Note, the logic here only works when offset is 0 here. + // Otherwise, it would treat "size" as the end offset instead of an actual byte count from offset. + if (offset < size) InternalWrite(buffer, ref offset, size); } |
