Fine tunned modules scheme.

Adjusted client modules.
Fixed proxy bug in http.

6 files changed, 17 insertions, 14 deletions

diff --git a/etc/check-links.lua b/etc/check-links.lua
index 4487593..79e6a54 100644
--- a/etc/check-links.lua
+++ b/etc/check-links.lua
@@ -4,8 +4,8 @@
 -- Author: Diego Nehab
 -- RCS ID: $Id$
 -----------------------------------------------------------------------------
-local http = require("http")
-local url = require("url")
+local http = require("socket.http")
+local url = require("socket.url")
 http.TIMEOUT = 10
 
 function readfile(path)
diff --git a/etc/check-memory.lua b/etc/check-memory.lua
index fdc6b9b..7892ba0 100644
--- a/etc/check-memory.lua
+++ b/etc/check-memory.lua
@@ -8,10 +8,10 @@ function load(s)
 end
 
 load("socket")
-load("url")
+load("socket.url")
 load("ltn12")
 load("mime")
-load("tp")
-load("smtp")
-load("http")
-load("ftp")
+load("socket.tp")
+load("socket.smtp")
+load("socket.http")
+load("socket.ftp")
diff --git a/etc/dict.lua b/etc/dict.lua
index dce1658..8c197f5 100644
--- a/etc/dict.lua
+++ b/etc/dict.lua
@@ -9,8 +9,10 @@
 -- Load required modules
 -----------------------------------------------------------------------------
 local socket = require("socket")
-local url = require("url")
-local tp = require("tp")
+local url = require("socket.url")
+local tp = require("socket.tp")
+
+module("socket.dict")
 
 -----------------------------------------------------------------------------
 -- Globals 
diff --git a/etc/get.lua b/etc/get.lua
index 712d807..0c95d54 100644
--- a/etc/get.lua
+++ b/etc/get.lua
@@ -5,9 +5,9 @@
 -- RCS ID: $Id$
 -----------------------------------------------------------------------------
 local socket = require("socket")
-local http = require("http")
-local ftp = require("ftp")
-local url = require("url")
+local http = require("socket.http")
+local ftp = require("socket.ftp")
+local url = require("socket.url")
 local ltn12 = require("ltn12")
 
 -- formats a number of seconds into human readable form
diff --git a/etc/lp.lua b/etc/lp.lua
index 3c36b11..b69cc02 100644
--- a/etc/lp.lua
+++ b/etc/lp.lua
@@ -39,7 +39,6 @@ local function connect(localhost, option)
         until localport > 731
         test(skt, err)
     else skt = test(socket.tcp()) end
-print("'" .. host .. "'")
     try(skt:connect(host, port))
     return { skt = skt, try = try }
 end
diff --git a/etc/tftp.lua b/etc/tftp.lua
index 70db050..f4af8bc 100644
--- a/etc/tftp.lua
+++ b/etc/tftp.lua
@@ -10,7 +10,9 @@
 -----------------------------------------------------------------------------
 local socket = require("socket")
 local ltn12 = require("ltn12")
-local url = require("url")
+local url = require("socket.url")
+
+module("socket.tftp")
 
 -----------------------------------------------------------------------------
 -- Program constants