summaryrefslogtreecommitdiff
path: root/methods/http.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-11-29 17:59:52 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2014-12-22 14:23:39 +0100
commit92e8c1ff287ab829de825e00cdf94744e699ff97 (patch)
tree01a66b8ce8616bdc71cbc150f04e2f7e524d06b9 /methods/http.cc
parent988d4f441eb2c7ac64cec339dbc02daa47fe84a4 (diff)
dispose http(s) 416 error page as non-content
Real webservers (like apache) actually send an error page with a 416 response, but our client didn't expect it leaving the page on the socket to be parsed as response for the next request (http) or as file content (https), which isn't what we want at all… Symptom is a "Bad header line" as html usually doesn't parse that well to an http-header. This manifests itself e.g. if we have a complete file (or larger) in partial/ which isn't discarded by If-Range as the server doesn't support it (or it is just newer, think: mirror rotation). It is a sort-of regression of 78c72d0ce22e00b194251445aae306df357d5c1a, which removed the filesize - 1 trick, but this had its own problems… To properly test this our webserver gains the ability to reply with transfer-encoding: chunked as most real webservers will use it to send the dynamically generated error pages. (The tests and their binary helpers had to be slightly modified to apply, but the patch to fix the issue itself is unchanged.) Closes: 768797
Diffstat (limited to 'methods/http.cc')
-rw-r--r--methods/http.cc2
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);