diff options
| author | Steven Barth <steven@midlink.org> | 2008-06-29 16:15:26 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-06-29 16:15:26 +0000 |
| commit | 66ec29f2437b813a5aaf9d246e255fcc660b30cc (patch) | |
| tree | dbe99456fff22bdfecb904213a30d66984fa3842 /libs/httpd | |
| parent | 50039c134e104632a7dfe10c9d39cf121aff9a0b (diff) | |
* libs/core: Moved ltn12 inside LuCI to avoid package conflicts with luasocket
Diffstat (limited to 'libs/httpd')
| -rw-r--r-- | libs/httpd/luasrc/httpd/handler/file.lua | 2 | ||||
| -rw-r--r-- | libs/httpd/luasrc/httpd/handler/luci.lua | 2 | ||||
| -rw-r--r-- | libs/httpd/luasrc/httpd/module.lua | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/httpd/luasrc/httpd/handler/file.lua b/libs/httpd/luasrc/httpd/handler/file.lua index 3c9248047..80282631e 100644 --- a/libs/httpd/luasrc/httpd/handler/file.lua +++ b/libs/httpd/luasrc/httpd/handler/file.lua @@ -21,7 +21,7 @@ require("luci.http.protocol.date") require("luci.http.protocol.mime") require("luci.http.protocol.conditionals") require("luci.fs") -require("ltn12") +local ltn12 = require("luci.ltn12") Simple = luci.util.class(luci.httpd.module.Handler) Response = luci.httpd.module.Response diff --git a/libs/httpd/luasrc/httpd/handler/luci.lua b/libs/httpd/luasrc/httpd/handler/luci.lua index 2fcb9953a..093741393 100644 --- a/libs/httpd/luasrc/httpd/handler/luci.lua +++ b/libs/httpd/luasrc/httpd/handler/luci.lua @@ -18,7 +18,7 @@ module("luci.httpd.handler.luci", package.seeall) require("luci.dispatcher") require("luci.http") require("luci.http.protocol.date") -require("ltn12") +local ltn12 = require("luci.ltn12") Luci = luci.util.class(luci.httpd.module.Handler) Response = luci.httpd.module.Response diff --git a/libs/httpd/luasrc/httpd/module.lua b/libs/httpd/luasrc/httpd/module.lua index 46cfa54ff..d0e398f44 100644 --- a/libs/httpd/luasrc/httpd/module.lua +++ b/libs/httpd/luasrc/httpd/module.lua @@ -14,7 +14,7 @@ $Id$ module("luci.httpd.module", package.seeall) require("luci.util") require("luci.http.protocol") -require("ltn12") +local ltn12 = require("luci.ltn12") @@ -133,4 +133,4 @@ end function Response.setstatus(self, status) self.status = status -end
\ No newline at end of file +end |