aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2023-01-08 13:39:24 +0100
committerKim Alvefur <zash@zash.se>2023-01-08 13:39:24 +0100
commit2d7eb38bde16a4e3d55f267be8860433748c0a74 (patch)
tree21e8355bb587eac6691af8546c0942d3bbc28d08
parent7c647e1cee1cae8846001b338a761b7e86c5f667 (diff)
parentfe97c773a6b8e61c6aee0511e30164e2fbdd6091 (diff)
downloadprosody-2d7eb38bde16a4e3d55f267be8860433748c0a74.tar.gz
prosody-2d7eb38bde16a4e3d55f267be8860433748c0a74.zip
Merge 0.12->trunk
-rw-r--r--net/http/server.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http/server.lua b/net/http/server.lua
index 97e15e42..4ebf96a1 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -377,12 +377,12 @@ function _M.send_file(response, f)
-- io.write("."); io.flush();
response.conn:write(chunk);
else
+ incomplete[response.conn] = nil;
if chunked then
response.conn:write("0\r\n\r\n");
end
-- io.write("\n");
if f.close then f:close(); end
- incomplete[response.conn] = nil;
return response:done();
end
end