Merge branch 'master' of http://git.fucktheforce.de/cgi-bin/git/httpupload

1 files changed, 2 insertions, 1 deletions

diff --git a/prosody-module/mod_http_upload_external/mod_http_upload_external.lua b/prosody-module/mod_http_upload_external/mod_http_upload_external.lua
index e2e0107..068961e 100644
--- a/prosody-module/mod_http_upload_external/mod_http_upload_external.lua
+++ b/prosody-module/mod_http_upload_external/mod_http_upload_external.lua
@@ -15,8 +15,9 @@ local xmpp_server_key = module:get_option("http_upload_external_server_key");
 local filetransfer_manager_ui_url = module:get_option("filetransfer_manager_ui_url");
 
 -- imports
+require"https";
 local st = require"util.stanza";
-local http = require"socket.http";
+local http = (string.len(url) >= 5 and string.sub(url,1,5) == "https") and require"ssl.https" or require"socket.http";
 local json = require"util.json";
 local dataform = require "util.dataforms".new;
 local ltn12 = require"ltn12";