Mercurial > prosody-hg
comparison net/http.lua @ 6501:71b6e8b48a12
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 26 Oct 2014 20:57:06 +0100 |
| parents | 57d23c26039b e4b998ffc922 |
| children | 8fed6ea12098 647adfd8f738 |
comparison
equal
deleted
inserted
replaced
| 6495:44df423f8290 | 6501:71b6e8b48a12 |
|---|---|
| 173 return nil, err; | 173 return nil, err; |
| 174 end | 174 end |
| 175 | 175 |
| 176 local sslctx = false; | 176 local sslctx = false; |
| 177 if using_https then | 177 if using_https then |
| 178 sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2" } }; | 178 sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2", "no_sslv3" } }; |
| 179 end | 179 end |
| 180 | 180 |
| 181 req.handler, req.conn = assert(server.wrapclient(conn, host, port_number, listener, "*a", sslctx)); | 181 req.handler, req.conn = assert(server.wrapclient(conn, host, port_number, listener, "*a", sslctx)); |
| 182 req.write = function (...) return req.handler:write(...); end | 182 req.write = function (...) return req.handler:write(...); end |
| 183 | 183 |
