diff options
author | Diego Nehab <diego@tecgraf.puc-rio.br> | 2007-07-11 19:25:47 +0000 |
---|---|---|
committer | Diego Nehab <diego@tecgraf.puc-rio.br> | 2007-07-11 19:25:47 +0000 |
commit | e394956cde629e24ecdd285c4c13c206891fcec4 (patch) | |
tree | 8ca4a4de56038f05e130078edf0d682aecccf1d8 | |
parent | 185b6d806cdf6110a7bd89729baba2b8c02a9d2e (diff) | |
download | luasocket-e394956cde629e24ecdd285c4c13c206891fcec4.tar.gz luasocket-e394956cde629e24ecdd285c4c13c206891fcec4.tar.bz2 luasocket-e394956cde629e24ecdd285c4c13c206891fcec4.zip |
Global variable references.
-rw-r--r-- | NEW | 2 | ||||
-rw-r--r-- | doc/index.html | 2 | ||||
-rw-r--r-- | src/ftp.lua | 6 |
3 files changed, 5 insertions, 5 deletions
@@ -2,7 +2,7 @@ What's New | |||
2 | 2 | ||
3 | This is just a bug-fix/update release. | 3 | This is just a bug-fix/update release. |
4 | 4 | ||
5 | * Fixed: crash when reading '*a' on closed socket (Duck); | 5 | * Fixed: crash when reading '*a' on closed socket (Paul Ducklin); |
6 | * Fixed: return values are consistent when reading from closed sockets; | 6 | * Fixed: return values are consistent when reading from closed sockets; |
7 | * Fixed: case sensitivity in headers of multipart messages in | 7 | * Fixed: case sensitivity in headers of multipart messages in |
8 | smtp.message() (Graham Henstridge); | 8 | smtp.message() (Graham Henstridge); |
diff --git a/doc/index.html b/doc/index.html index 0d41941..1605af1 100644 --- a/doc/index.html +++ b/doc/index.html | |||
@@ -137,7 +137,7 @@ has been helping a lot too! Thanks to you all! | |||
137 | </p> | 137 | </p> |
138 | 138 | ||
139 | <ul> | 139 | <ul> |
140 | <li> Fixed: crash when reading '*a' on closed socket (Duck); | 140 | <li> Fixed: crash when reading '*a' on closed socket (Paul Ducklin); |
141 | <li> Fixed: return values are consistent when reading from closed sockets; | 141 | <li> Fixed: return values are consistent when reading from closed sockets; |
142 | <li> Fixed: case sensitivity in headers of multipart | 142 | <li> Fixed: case sensitivity in headers of multipart |
143 | messages in smtp.message() (Graham Henstridge); | 143 | messages in smtp.message() (Graham Henstridge); |
diff --git a/src/ftp.lua b/src/ftp.lua index 18d22f7..f27e838 100644 --- a/src/ftp.lua +++ b/src/ftp.lua | |||
@@ -88,7 +88,7 @@ function metat.__index:port(ip, port) | |||
88 | ip, port = self.try(self.tp:getcontrol():getsockname()) | 88 | ip, port = self.try(self.tp:getcontrol():getsockname()) |
89 | self.server = self.try(socket.bind(ip, 0)) | 89 | self.server = self.try(socket.bind(ip, 0)) |
90 | ip, port = self.try(self.server:getsockname()) | 90 | ip, port = self.try(self.server:getsockname()) |
91 | self.try(server:settimeout(TIMEOUT)) | 91 | self.try(self.server:settimeout(TIMEOUT)) |
92 | end | 92 | end |
93 | local pl = math.mod(port, 256) | 93 | local pl = math.mod(port, 256) |
94 | local ph = (port - pl)/256 | 94 | local ph = (port - pl)/256 |
@@ -187,9 +187,9 @@ end | |||
187 | ----------------------------------------------------------------------------- | 187 | ----------------------------------------------------------------------------- |
188 | -- High level FTP API | 188 | -- High level FTP API |
189 | ----------------------------------------------------------------------------- | 189 | ----------------------------------------------------------------------------- |
190 | function override(t) | 190 | local function override(t) |
191 | if t.url then | 191 | if t.url then |
192 | u = url.parse(t.url) | 192 | local u = url.parse(t.url) |
193 | for i,v in base.pairs(t) do | 193 | for i,v in base.pairs(t) do |
194 | u[i] = v | 194 | u[i] = v |
195 | end | 195 | end |