more fixes for lua 5.2

keplerproject · Jan 29, 2013 · 6b35861 · 6b35861
1 parent 4b00539
commit 6b35861
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 82 deletions.
diff --git a/samples/hello_config.lua b/samples/hello_config.lua
@@ -1,9 +1,10 @@
 isolated = false
 local app = dofile(docroot .. "/hello.lua")
+local wsx = require "wsapi.xavante"
 
 rules = {
   {
     match = { "^/app$", "^/app/" },
-    with = wsapi.xavante.makeHandler(app, "/app", docroot, docroot)
+    with = wsx.makeHandler(app, "/app", docroot, docroot)
   },
 }
diff --git a/src/launcher/wsapi b/src/launcher/wsapi
@@ -123,17 +123,17 @@ addrule{ -- wsapihandler example
 }
 
 if opts.cgilua then
-  require "xavante.cgiluahandler"
+  local hcgi = require "xavante.cgiluahandler"
   addrule{
     match = {"%.lp$", "%.lp/.*$", "%.cgi$", "%.cgi/.*$" },
-    with = xavante.cgiluahandler.makeHandler (config.docroot, launcher_params)
+    with = hcgi.makeHandler (config.docroot, launcher_params)
   }
 end
 if opts.op then
-  require "orbit.ophandler"
+  local hop = require "orbit.ophandler"
   addrule{
     match = {"%.op$", "%.op/.*$" },
-    with = orbit.ophandler.makeHandler (config.docroot, launcher_params)
+    with = hop.makeHandler (config.docroot, launcher_params)
   }
 end