SASLprep usernames and passwords.

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 2c0c57847ba87cc4242245d2dc16463f67ed470e..e22e59454ab3070649284db4fe938bc2bb49e610 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -32,7 +32,26 @@ end
 
 -- Required to be able to find packages installed with luarocks
 pcall(require, "luarocks.require")
-require "util.require";
+
+-- Replace require with one that doesn't pollute _G
+do
+       local _realG = _G;
+       local _real_require = require;
+       function require(...)
+               local curr_env = getfenv(2);
+               local curr_env_mt = getmetatable(getfenv(2));
+               local _realG_mt = getmetatable(_realG);
+               if curr_env_mt and curr_env_mt.__index and not curr_env_mt.__newindex and _realG_mt then
+                       local old_newindex
+                       old_newindex, _realG_mt.__newindex = _realG_mt.__newindex, curr_env;
+                       local ret = _real_require(...);
+                       _realG_mt.__newindex = old_newindex;
+                       return ret;
+               end
+               return _real_require(...);
+       end
+end
+
 
 config = require "core.configmanager"
 
@@ -263,7 +282,7 @@ end
 function loop()
        -- Error handler for errors that make it this far
        local function catch_uncaught_error(err)
-               if err:match("%d*: interrupted!$") then
+               if type(err) == "string" and err:match("%d*: interrupted!$") then
                        return "quitting";
                end