From 66ec29f2437b813a5aaf9d246e255fcc660b30cc Mon Sep 17 00:00:00 2001
From: Steven Barth <steven@midlink.org>
Date: Sun, 29 Jun 2008 16:15:26 +0000
Subject: [PATCH] * libs/core: Moved ltn12 inside LuCI to avoid package
 conflicts with luasocket

---
 libs/core/{lua => luasrc}/ltn12.lua       | 2 +-
 libs/http/luasrc/http/protocol.lua        | 2 +-
 libs/http/luasrc/http/protocol/filter.lua | 2 +-
 libs/httpd/luasrc/httpd/handler/file.lua  | 2 +-
 libs/httpd/luasrc/httpd/handler/luci.lua  | 2 +-
 libs/httpd/luasrc/httpd/module.lua        | 4 ++--
 libs/sgi-cgi/luasrc/sgi/cgi.lua           | 2 +-
 libs/sgi-webuci/luasrc/sgi/webuci.lua     | 2 +-
 libs/sgi-wsapi/luasrc/sgi/wsapi.lua       | 2 +-
 libs/web/luasrc/http.lua                  | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)
 rename libs/core/{lua => luasrc}/ltn12.lua (99%)

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 417da84d5..0868634d8 100644
--- 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 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
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
diff --git a/libs/sgi-cgi/luasrc/sgi/cgi.lua b/libs/sgi-cgi/luasrc/sgi/cgi.lua
index 7f54e7021..427fa8733 100644
--- 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 b9033f370..3e60575e0 100644
--- 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 5b237cd7a..ebae9fc27 100644
--- 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 f37d67343..7a0a10232 100644
--- 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")
 
-- 
2.11.0