diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-15 21:22:45 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-15 21:22:45 +0100 |
| commit | c30a7e8545d1354afe6c25018c7b74d6e09604da (patch) | |
| tree | 02949c230f40ca6734b9263cca7e2d1caae3bdee | |
| parent | 6c0fbb813fe6fc10fefeb076221e756521bd033e (diff) | |
| parent | 91b727be710169b424cae0cd9f7d782230599b2b (diff) | |
| download | prosody-c30a7e8545d1354afe6c25018c7b74d6e09604da.tar.gz prosody-c30a7e8545d1354afe6c25018c7b74d6e09604da.zip | |
Merge 0.9->trunk
| -rw-r--r-- | net/http/parser.lua | 3 | ||||
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/http/parser.lua b/net/http/parser.lua index 34742d2b..9688e052 100644 --- a/net/http/parser.lua +++ b/net/http/parser.lua @@ -133,7 +133,8 @@ function httpstream.new(success_cb, error_cb, parser_type, options_cb) 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 diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index eb10cd35..6764e857 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -642,7 +642,7 @@ function check_auth_policy(event) 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 |