projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.10->trunk
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index e8f81d5d6ec6a8144237cd37635a7f142c303ba7..61be6c2e29218d4e16c4bb0949c9c55d72cb0bac 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-121,6
+121,7
@@
end
function load_libraries()
-- Load socket framework
function load_libraries()
-- Load socket framework
+ socket = require "socket";
server = require "net.server"
end
server = require "net.server"
end
@@
-292,6
+293,7
@@
function load_secondary_libraries()
require "util.import"
require "util.xmppstream"
require "core.stanza_router"
require "util.import"
require "util.xmppstream"
require "core.stanza_router"
+ require "core.statsmanager"
require "core.hostmanager"
require "core.portmanager"
require "core.modulemanager"
require "core.hostmanager"
require "core.portmanager"
require "core.modulemanager"