From 72eceedc62d2cb65421fe9e0062a5d8f8c2bd3c4 Mon Sep 17 00:00:00 2001
From: Diego Nehab
Date: Wed, 5 Oct 2005 03:16:17 +0000
Subject: Bugs sent by David.
---
TODO | 2 +-
doc/ftp.html | 4 ++--
doc/http.html | 2 +-
doc/installation.html | 11 +++++++----
doc/smtp.html | 2 +-
etc/dict.lua | 2 --
etc/lp.lua | 1 -
etc/tftp.lua | 1 -
src/ftp.lua | 1 -
src/http.lua | 1 -
src/ltn12.lua | 1 -
src/mime.lua | 1 -
src/smtp.lua | 1 -
src/socket.lua | 1 -
src/tp.lua | 1 -
src/url.lua | 1 -
16 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/TODO b/TODO
index 1d7a1db..a405fbf 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-
+fix unix.c to return just a function
get rid of setmetatable(, nil) since packages don't need this anymore in
5.1
diff --git a/doc/ftp.html b/doc/ftp.html
index 8b7ed96..1886344 100644
--- a/doc/ftp.html
+++ b/doc/ftp.html
@@ -140,7 +140,7 @@ authentication. Defaults to "ftp:anonymous@anonymous.org";
LTN12
pump step function used to pass data from the
server to the sink. Defaults to the LTN12 pump.step function;
-accept: An optional function to be used instead of
+create: An optional function to be used instead of
socket.tcp when the communications socket is created.
@@ -225,7 +225,7 @@ authentication. Defaults to "ftp:anonymous@anonymous.org";
LTN12
pump step function used to pass data from the
server to the sink. Defaults to the LTN12 pump.step function;
-accept: An optional function to be used instead of
+create: An optional function to be used instead of
socket.tcp when the communications socket is created.
diff --git a/doc/http.html b/doc/http.html
index 27942b1..096ab2b 100644
--- a/doc/http.html
+++ b/doc/http.html
@@ -180,7 +180,7 @@ Defaults to the LTN12 pump.step function.
proxy: The URL of a proxy server to use. Defaults to no proxy;
redirect: Set to false to prevent the
function from automatically following 301 or 302 server redirect messages;
-accept: An optional function to be used instead of
+create: An optional function to be used instead of
socket.tcp when the communications socket is created.
diff --git a/doc/installation.html b/doc/installation.html
index d30e919..1b82ed3 100644
--- a/doc/installation.html
+++ b/doc/installation.html
@@ -76,9 +76,9 @@ distribution directory structure:
<SHARE>/compat-5.1.lua
<SHARE>/ltn12.lua
-<SHARE>/mime/init.lua
+<SHARE>/mime/init.lua (originally mime.lua)
<LIB>/mime/core.dll
-<SHARE>/socket/init.lua
+<SHARE>/socket/init.lua (originally socket.lua)
<LIB>/socket/core.dll
<SHARE>/socket/http.lua
<SHARE>/socket/tp.lua
@@ -88,7 +88,10 @@ distribution directory structure:
Naturally, on Unix systems, core.dll
-would be replaced by core.so.
+would be replaced by core.so. Notice that in the instalation,
+socket.lua becomes socket/init.lua, and the same happens
+with mime.lua, which becomes mime/init.lua.
+
In order for the interpreter to find all LuaSocket components, three
environment variables need to be set. The first environment variable tells
@@ -110,7 +113,7 @@ LUA_CPATH=<LIB>/?.dll;?.dll
Again, naturally, on Unix systmems the shared library extension would be
-.so instead of .dll
+.so instead of .dll.
Using LuaSocket
diff --git a/doc/smtp.html b/doc/smtp.html
index 1e1523b..14def8a 100644
--- a/doc/smtp.html
+++ b/doc/smtp.html
@@ -161,7 +161,7 @@ local machine host name;
LTN12
pump step function used to pass data from the
source to the server. Defaults to the LTN12 pump.step function;
-accept: An optional function to be used instead of
+create: An optional function to be used instead of
socket.tcp when the communications socket is created.
diff --git a/etc/dict.lua b/etc/dict.lua
index 62d6913..2d035a7 100644
--- a/etc/dict.lua
+++ b/etc/dict.lua
@@ -14,9 +14,7 @@ local table = require("table")
local socket = require("socket")
local url = require("socket.url")
local tp = require("socket.tp")
-
module("socket.dict")
-getmetatable(_M).__index = nil
-----------------------------------------------------------------------------
-- Globals
diff --git a/etc/lp.lua b/etc/lp.lua
index 66a9692..a60fb86 100644
--- a/etc/lp.lua
+++ b/etc/lp.lua
@@ -15,7 +15,6 @@ local string = require("string")
local socket = require("socket")
local ltn12 = require("ltn12")
module("socket.lp")
-getmetatable(_M).__index = nil
-- default port
PORT = 515
diff --git a/etc/tftp.lua b/etc/tftp.lua
index b974db8..1b589fb 100644
--- a/etc/tftp.lua
+++ b/etc/tftp.lua
@@ -16,7 +16,6 @@ local socket = require("socket")
local ltn12 = require("ltn12")
local url = require("socket.url")
module("socket.tftp")
-getmetatable(_M).__index = nil
-----------------------------------------------------------------------------
-- Program constants
diff --git a/src/ftp.lua b/src/ftp.lua
index 226e04c..c83c1cb 100644
--- a/src/ftp.lua
+++ b/src/ftp.lua
@@ -17,7 +17,6 @@ local url = require("socket.url")
local tp = require("socket.tp")
local ltn12 = require("ltn12")
module("socket.ftp")
-getmetatable(_M).__index = nil
-----------------------------------------------------------------------------
-- Program constants
diff --git a/src/http.lua b/src/http.lua
index fe779a3..f08da07 100644
--- a/src/http.lua
+++ b/src/http.lua
@@ -16,7 +16,6 @@ local string = require("string")
local base = _G
local table = require("table")
module("socket.http")
-getmetatable(_M).__index = nil
-----------------------------------------------------------------------------
-- Program constants
diff --git a/src/ltn12.lua b/src/ltn12.lua
index 633e0d7..733422d 100644
--- a/src/ltn12.lua
+++ b/src/ltn12.lua
@@ -12,7 +12,6 @@ local string = require("string")
local table = require("table")
local base = _G
module("ltn12")
-getmetatable(_M).__index = nil
filter = {}
source = {}
diff --git a/src/mime.lua b/src/mime.lua
index af42dcd..f6a9333 100644
--- a/src/mime.lua
+++ b/src/mime.lua
@@ -14,7 +14,6 @@ local mime = require("mime.core")
local io = require("io")
local string = require("string")
module("mime")
-getmetatable(_M).__index = nil
-- encode, decode and wrap algorithm tables
encodet = {}
diff --git a/src/smtp.lua b/src/smtp.lua
index 5c485c2..03b9e9b 100644
--- a/src/smtp.lua
+++ b/src/smtp.lua
@@ -18,7 +18,6 @@ local tp = require("socket.tp")
local ltn12 = require("ltn12")
local mime = require("mime")
module("socket.smtp")
-getmetatable(_M).__index = nil
-----------------------------------------------------------------------------
-- Program constants
diff --git a/src/socket.lua b/src/socket.lua
index be01667..6eb3159 100644
--- a/src/socket.lua
+++ b/src/socket.lua
@@ -12,7 +12,6 @@ local string = require("string")
local math = require("math")
local socket = require("socket.core")
module("socket")
-getmetatable(_M).__index = nil
-----------------------------------------------------------------------------
-- Exported auxiliar functions
diff --git a/src/tp.lua b/src/tp.lua
index 7823699..984bd67 100644
--- a/src/tp.lua
+++ b/src/tp.lua
@@ -13,7 +13,6 @@ local string = require("string")
local socket = require("socket")
local ltn12 = require("ltn12")
module("socket.tp")
-getmetatable(_M).__index = nil
-----------------------------------------------------------------------------
-- Program constants
diff --git a/src/url.lua b/src/url.lua
index 5427cbc..ec62ad6 100644
--- a/src/url.lua
+++ b/src/url.lua
@@ -12,7 +12,6 @@ local string = require("string")
local base = _G
local table = require("table")
module("socket.url")
-getmetatable(_M).__index = nil
-----------------------------------------------------------------------------
-- Module version
--
cgit v1.2.3-55-g6feb