aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2017-09-26 17:24:25 +0100
committerMatthew Wild <mwild1@gmail.com>2017-09-26 17:24:25 +0100
commitd6833915bcfaeb6600c0af911102a8362e26e93e (patch)
tree575fdc7082baf42f3c7871cac1bc03d7fa65f905 /prosody
parentMerge 0.10->trunk (diff)
parentmod_s2s: Use a separate resolver object for each outgoing session (diff)
downloadprosody-d6833915bcfaeb6600c0af911102a8362e26e93e.tar.xz
prosody-d6833915bcfaeb6600c0af911102a8362e26e93e.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody4
1 files changed, 2 insertions, 2 deletions
diff --git a/prosody b/prosody
index 1895cf54b..9a15af1c5 100755
--- a/prosody
+++ b/prosody
@@ -20,8 +20,8 @@ CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
local function is_relative(path)
local path_sep = package.config:sub(1,1);
- return ((path_sep == "/" and path:sub(1,1) ~= "/")
- or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
+ return ((path_sep == "/" and path:sub(1,1) ~= "/")
+ or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
end
-- Tell Lua where to find our libraries