projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net.dns: Support for resolving AAAA records
[prosody.git]
/
net
/
server.lua
diff --git
a/net/server.lua
b/net/server.lua
index 0102cee65a13daaf546bcf8e5a55ed37430f15f2..1c1a63a4743651ea6120a582dd070a584cdb8233 100644
(file)
--- a/
net/server.lua
+++ b/
net/server.lua
@@
-1,5
+1,12
@@
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
-local use_luaevent = require "core.configmanager".get("*", "core", "use_libevent");
+local use_luaevent =
prosody and
require "core.configmanager".get("*", "core", "use_libevent");
if use_luaevent then
use_luaevent = pcall(require, "luaevent.core");
if use_luaevent then
use_luaevent = pcall(require, "luaevent.core");
@@
-36,7
+43,6
@@
if use_luaevent then
if type(signal_id) ~= "number" then
return false, "invalid-signal";
end
if type(signal_id) ~= "number" then
return false, "invalid-signal";
end
- --_signal_signal(signal_id, handler);
return server.hook_signal(signal_id, handler);
end
end
return server.hook_signal(signal_id, handler);
end
end
@@
-47,4
+53,4
@@
end
-- require "net.server" shall now forever return this,
-- ie. server_select or server_event as chosen above.
-- require "net.server" shall now forever return this,
-- ie. server_select or server_event as chosen above.
-return server;
+return server;