summaryrefslogtreecommitdiffhomepage
path: root/libs/http
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-06-29 16:15:26 +0000
committerSteven Barth <steven@midlink.org>2008-06-29 16:15:26 +0000
commit66ec29f2437b813a5aaf9d246e255fcc660b30cc (patch)
treedbe99456fff22bdfecb904213a30d66984fa3842 /libs/http
parent50039c134e104632a7dfe10c9d39cf121aff9a0b (diff)
* libs/core: Moved ltn12 inside LuCI to avoid package conflicts with luasocket
Diffstat (limited to 'libs/http')
-rw-r--r--libs/http/luasrc/http/protocol.lua2
-rw-r--r--libs/http/luasrc/http/protocol/filter.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/http/luasrc/http/protocol.lua b/libs/http/luasrc/http/protocol.lua
index 8fb5e6f2f..ac5857889 100644
--- a/libs/http/luasrc/http/protocol.lua
+++ b/libs/http/luasrc/http/protocol.lua
@@ -15,7 +15,7 @@ $Id$
module("luci.http.protocol", package.seeall)
-require("ltn12")
+local ltn12 = require("luci.ltn12")
require("luci.http.protocol.filter")
HTTP_MAX_CONTENT = 1024*4 -- 4 kB maximum content size
diff --git a/libs/http/luasrc/http/protocol/filter.lua b/libs/http/luasrc/http/protocol/filter.lua
index 71263c351..de106aae4 100644
--- a/libs/http/luasrc/http/protocol/filter.lua
+++ b/libs/http/luasrc/http/protocol/filter.lua
@@ -15,7 +15,7 @@ $Id$
module("luci.http.protocol.filter", package.seeall)
-require("ltn12")
+local ltn12 = require("luci.ltn12")
-- Factory that produces a filter which normalizes chunked transfer encoding