* libs/core: Moved ltn12 inside LuCI to avoid package conflicts with luasocket

diff --git a/libs/core/lua/ltn12.lua b/libs/core/luasrc/ltn12.lua
similarity index 99%
rename from libs/core/lua/ltn12.lua
rename to libs/core/luasrc/ltn12.lua
index 417da84d599aea09f9d89f0c8aae74657ec5d3d2..0868634d820026017568259b9ac59e7f0bc1e94e 100644 (file)
--- a/libs/core/lua/ltn12.lua
+++ b/libs/core/luasrc/ltn12.lua
@@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE.
 local string = require("string")
 local table = require("table")
 local base = _G
-module("ltn12")
+module("luci.ltn12")
 
 filter = {}
 source = {}

diff --git a/libs/http/luasrc/http/protocol.lua b/libs/http/luasrc/http/protocol.lua
index 8fb5e6f2f154d26339e727db9817f176d2bb44e3..ac58578892876cde86c811b01e3e92af75ff082e 100644 (file)
--- 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 71263c3510355800fa26588f4b0e21f6d37c2ef2..de106aae42f6eedd174e722e8fb515adacd75577 100644 (file)
--- 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

diff --git a/libs/httpd/luasrc/httpd/handler/file.lua b/libs/httpd/luasrc/httpd/handler/file.lua
index 3c92480477048fe1be37d30e8c9454a1fca90e08..80282631e570fd6e1df56f825de76dd757d863ce 100644 (file)
--- 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 2fcb9953aeab7ab78b0afade4e08f7f56b378a86..0937413935b754344a10288112e77ff5f37dcb07 100644 (file)
--- 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 46cfa54ffd6bbb49c50c21a278bbea45f544b56f..d0e398f44e1aba2bf53400ff94d18858afee2ee5 100644 (file)
--- 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

diff --git a/libs/sgi-cgi/luasrc/sgi/cgi.lua b/libs/sgi-cgi/luasrc/sgi/cgi.lua
index 7f54e70218dbcf74feae327f9f65192523ee0cef..427fa87331e567b697bf180ca91570df63e92dbc 100644 (file)
--- a/libs/sgi-cgi/luasrc/sgi/cgi.lua
+++ b/libs/sgi-cgi/luasrc/sgi/cgi.lua
@@ -24,7 +24,7 @@ limitations under the License.
 
 ]]--
 module("luci.sgi.cgi", package.seeall)
-require("ltn12")
+local ltn12 = require("luci.ltn12")
 require("luci.http")
 require("luci.sys")
 require("luci.dispatcher")

diff --git a/libs/sgi-webuci/luasrc/sgi/webuci.lua b/libs/sgi-webuci/luasrc/sgi/webuci.lua
index b9033f3702b798e9a17f8f6f3d7c0f61aa874060..3e60575e0b5dbbf841d47ce1f812a58c5a9ec705 100644 (file)
--- a/libs/sgi-webuci/luasrc/sgi/webuci.lua
+++ b/libs/sgi-webuci/luasrc/sgi/webuci.lua
@@ -24,7 +24,7 @@ limitations under the License.
 
 ]]--
 module("luci.sgi.webuci", package.seeall)
-require("ltn12")
+local ltn12 = require("luci.ltn12")
 require("luci.http")
 require("luci.util")
 require("luci.dispatcher")

diff --git a/libs/sgi-wsapi/luasrc/sgi/wsapi.lua b/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
index 5b237cd7a53c78ed30056186f09029e726f08cb7..ebae9fc2778dfeff8bd2fa64364197639c76911e 100644 (file)
--- a/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
+++ b/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
@@ -24,7 +24,7 @@ limitations under the License.
 
 ]]--
 module("luci.sgi.wsapi", package.seeall)
-require("ltn12")
+local ltn12 = require("luci.ltn12")
 require("luci.http")
 require("luci.dispatcher")
 require("luci.http.protocol")

diff --git a/libs/web/luasrc/http.lua b/libs/web/luasrc/http.lua
index f37d67343ea59b561ff74fcd52e6055ed008454e..7a0a102325f3c76a37c07b57de635173f69f14fa 100644 (file)
--- a/libs/web/luasrc/http.lua
+++ b/libs/web/luasrc/http.lua
@@ -25,7 +25,7 @@ limitations under the License.
 ]]--
 
 module("luci.http", package.seeall)
-require("ltn12")
+local ltn12 = require("luci.ltn12")
 require("luci.http.protocol")
 require("luci.util")