Software / code / prosody
Changeset
5476:dc9485ac266b
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 15 Apr 2013 21:22:45 +0100 |
| parents | 5473:3db05041c278 (current diff) 5475:c2c9f07c5d6a (diff) |
| children | 5478:de19e6005f1a |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/net/http/parser.lua Mon Apr 15 16:43:08 2013 +0100 +++ b/net/http/parser.lua Mon Apr 15 21:22:45 2013 +0100 @@ -133,7 +133,8 @@ buf = buf:gsub("^.-\r\n\r\n", ""); -- This ensure extensions and trailers are stripped success_cb(packet); elseif #buf - chunk_start + 2 >= chunk_size then -- we have a chunk - packet.body = packet.body..buf:sub(chunk_start, chunk_start + chunk_size); + print(chunk_start, chunk_size, ("%q"):format(buf)) + packet.body = packet.body..buf:sub(chunk_start, chunk_start + (chunk_size-1)); buf = buf:sub(chunk_start + chunk_size + 2); chunk_size, chunk_start = nil, nil; else -- Partial chunk remaining
--- a/plugins/mod_s2s/mod_s2s.lua Mon Apr 15 16:43:08 2013 +0100 +++ b/plugins/mod_s2s/mod_s2s.lua Mon Apr 15 21:22:45 2013 +0100 @@ -642,7 +642,7 @@ if must_secure and not session.cert_identity_status then module:log("warn", "Forbidding insecure connection to/from %s", host); if session.direction == "incoming" then - session:close({ condition = "not-authorized", text = "Your server's certificate is invalid, expired, or not trusted by"..session.to_host }); + session:close({ condition = "not-authorized", text = "Your server's certificate is invalid, expired, or not trusted by "..session.to_host }); else -- Close outgoing connections without warning session:close(false); end
