aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-10-05 19:16:32 +0100
committerMatthew Wild <mwild1@gmail.com>2008-10-05 19:16:32 +0100
commit3b33f156543f9d521885afd84d479052b4debcc0 (patch)
tree61b7ce7a6bfc0919de331db7855cf2e04e349eaf /core
parent11883a5b0bd98527f9cf6ad644a285551dce02c4 (diff)
parent0c9336110d8dceb2c9801ee68b9817801014fefe (diff)
downloadprosody-3b33f156543f9d521885afd84d479052b4debcc0.tar.gz
prosody-3b33f156543f9d521885afd84d479052b4debcc0.zip
Merged local TLS branch
Diffstat (limited to 'core')
-rw-r--r--core/modulemanager.lua1
-rw-r--r--core/stanza_router.lua1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 696e0f08..1ad1f990 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -49,6 +49,7 @@ function loadall()
load("legacyauth");
load("roster");
load("register");
+ load("tls");
end
function load(name)
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 89bea131..489bb96d 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -11,6 +11,7 @@ require "util.jid"
local jid_split = jid.split;
function core_process_stanza(origin, stanza)
+ log("debug", "Received: "..tostring(stanza))
local to = stanza.attr.to;
if not to or (hosts[to] and hosts[to].type == "local") then