prosody
8fed6ea12098
net/http.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

net/http.lua @ 6502:8fed6ea12098

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 26 Oct 2014 20:58:02 +0100
parent 6383:ec8878113907
parent 6501:71b6e8b48a12
child 6791:e813e8cf6046
comparison
equal deleted inserted replaced
6485:4224abbf0fdd 6502:8fed6ea12098
163 end 163 end
164 local port_number = port and tonumber(port) or (using_https and 443 or 80); 164 local port_number = port and tonumber(port) or (using_https and 443 or 80);
165 165
166 local sslctx = false; 166 local sslctx = false;
167 if using_https then 167 if using_https then
168 sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2" } }; 168 sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2", "no_sslv3" } };
169 end 169 end
170 170
171 local handler, conn = server.addclient(host, port_number, listener, "*a", sslctx) 171 local handler, conn = server.addclient(host, port_number, listener, "*a", sslctx)
172 if not handler then 172 if not handler then
173 callback(nil, 0, req); 173 callback(nil, 0, req);