2019-02-22 19:43:00

1 files changed, 21 insertions, 19 deletions

diff --git a/tex/context/base/mkiv/l-lua.lua b/tex/context/base/mkiv/l-lua.lua
index 426706f06..d8989364e 100644
--- a/tex/context/base/mkiv/l-lua.lua
+++ b/tex/context/base/mkiv/l-lua.lua
@@ -35,8 +35,6 @@ if LUAVERSION < 5.2 and jit then
     LUAVERSION   = 5.2
 end
 
-_LUAVERSION = LUAVERSION -- for old times sake, will go away
-
 -- lpeg
 
 if not lpeg then
@@ -230,23 +228,27 @@ elseif not ffi.number then
     ffi.number = tonumber
 end
 
-if not bit32 then -- and utf8 then
- -- bit32 = load ( [[ -- replacement code with 5.3 syntax so that 5.2 doesn't bark on it ]] )
-    bit32 = require("l-bit32")
-end
+-- if not bit32 then -- and utf8 then
+--  -- bit32 = load ( [[ -- replacement code with 5.3 syntax so that 5.2 doesn't bark on it ]] )
+--     bit32 = require("l-bit32")
+-- end
 
 -- We need this due a bug in luatex socket loading:
 
-local loaded = package.loaded
-
-if not loaded["socket"] then loaded["socket"] = loaded["socket.core"] end
-if not loaded["mime"]   then loaded["mime"]   = loaded["mime.core"]   end
-
-if not socket.mime then socket.mime = package.loaded["mime"] end
-
-if not loaded["socket.mime"] then loaded["socket.mime"] = socket.mime end
-if not loaded["socket.http"] then loaded["socket.http"] = socket.http end
-if not loaded["socket.ftp"]  then loaded["socket.ftp"]  = socket.ftp  end
-if not loaded["socket.smtp"] then loaded["socket.smtp"] = socket.smtp end
-if not loaded["socket.tp"]   then loaded["socket.tp"]   = socket.tp   end
-if not loaded["socket.url"]  then loaded["socket.url"]  = socket.url  end
+-- local loaded = package.loaded
+--
+-- if not loaded["socket"] then loaded["socket"] = loaded["socket.core"] end
+-- if not loaded["mime"]   then loaded["mime"]   = loaded["mime.core"]   end
+--
+-- if not socket.mime then socket.mime = package.loaded["mime"] end
+--
+-- if not loaded["socket.mime"] then loaded["socket.mime"] = socket.mime end
+-- if not loaded["socket.http"] then loaded["socket.http"] = socket.http end
+-- if not loaded["socket.ftp"]  then loaded["socket.ftp"]  = socket.ftp  end
+-- if not loaded["socket.smtp"] then loaded["socket.smtp"] = socket.smtp end
+-- if not loaded["socket.tp"]   then loaded["socket.tp"]   = socket.tp   end
+-- if not loaded["socket.url"]  then loaded["socket.url"]  = socket.url  end
+
+if LUAVERSION > 5.3 then
+    collectgarbage("generational")
+end