From: Kim Alvefur <zash@zash.se>
Date: Sun, 26 Oct 2014 19:57:06 +0000 (+0100)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=e59d6ea986ec9c67fdda12f1861ed430ec2ea591;p=prosody.git

Merge 0.9->0.10
---

e59d6ea986ec9c67fdda12f1861ed430ec2ea591
diff --cc net/http.lua
index 0c0ef967,8ce47494..e6bf0018
--- a/net/http.lua
+++ b/net/http.lua
@@@ -172,10 -172,10 +172,10 @@@ function request(u, ex, callback
  		callback(nil, 0, req);
  		return nil, err;
  	end
 -	
 +
  	local sslctx = false;
  	if using_https then
- 		sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2" } };
+ 		sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2", "no_sslv3" } };
  	end
  
  	req.handler, req.conn = assert(server.wrapclient(conn, host, port_number, listener, "*a", sslctx));