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]
/
util
/
async.lua
diff --git
a/util/async.lua
b/util/async.lua
index 968ec80495489b51b66a8e1e1ba6f8c201b7e14d..7b2eae54b07eca616e8b03cc13a3ce8fbab54db9 100644
(file)
--- a/
util/async.lua
+++ b/
util/async.lua
@@
-25,7
+25,7
@@
end
local function waiter(num)
local thread = coroutine.running();
if not thread then
local function waiter(num)
local thread = coroutine.running();
if not thread then
- error("Not running in an async context, see http://prosody.im/doc/developers/async");
+ error("Not running in an async context, see http
s
://prosody.im/doc/developers/async");
end
num = num or 1;
local waiting;
end
num = num or 1;
local waiting;
@@
-48,7
+48,7
@@
local function guarder()
return function (id, func)
local thread = coroutine.running();
if not thread then
return function (id, func)
local thread = coroutine.running();
if not thread then
- error("Not running in an async context, see http://prosody.im/doc/developers/async");
+ error("Not running in an async context, see http
s
://prosody.im/doc/developers/async");
end
local guard = guards[id];
if not guard then
end
local guard = guards[id];
if not guard then