diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 14:17:04 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 14:17:04 +0200 |
| commit | 68be2fbb252a71303046e2ca7866cd659a91b585 (patch) | |
| tree | d9ad50c5fa43943c409fed2e7e8d476f4603fd42 /methods/http.cc | |
| parent | e29a7a394cfd41e8bad81535e0a8c07654f34bf6 (diff) | |
| parent | 15901516326737a67f2a9af26cd7e434162de019 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'methods/http.cc')
| -rw-r--r-- | methods/http.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/methods/http.cc b/methods/http.cc index f2a4a4db6..1b996db98 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -440,6 +440,8 @@ bool HttpServerState::RunData(FileFd * const File) loss of the connection means we are done */ if (Encoding == Closes) In.Limit(-1); + else if (JunkSize != 0) + In.Limit(JunkSize); else In.Limit(Size - StartPos); |