Merge branch 'master' into hjelmeland-patch-1

Changed return text for ETIMEDOUT/ WSAETIMEDOUT to “connection timeout”.

This is needed for the application to be able tell to the difference between timeout of TCP connection (ETIMEDOUT/ WSAETIMEDOUT) and a normal return from a non-blocking socket (error codes EAGAIN/WSAEWOULDBLOCK). Both situations returned the text “timeout”.

docs/installation.html

@@ -79,17 +79,6 @@ distribution directory structure:</p>
 would be replaced by <tt>core.so</tt>.  
 </p>
 
-<p>
-Alternatively, you can build and install LuaSocket using vcpkg dependency manager:
-
-<pre class=example>
-./vcpkg install luasocket
-</pre>
-
-The luasocket port in vcpkg is kept up to date by microsoft team members and community contributors.
-If the version is out of date, please create an issue or pull request on the vcpkg repository.
-
-</p>
 <h3>Using LuaSocket</h3>
 
 <p> With the above setup, and an interpreter with shared library support,
@@ -100,7 +89,7 @@ it should be easy to use LuaSocket. Just fire the interpreter and use the
 Lua 5.2.2  Copyright (C) 1994-2013 Lua.org, PUC-Rio
 &gt; socket = require("socket")
 &gt; print(socket._VERSION)
---&gt; LuaSocket 3.1.0
+--&gt; LuaSocket 3.0.0
 </pre>
 
 <p> Each module loads their dependencies automatically, so you only need to

docs/ltn12.html

@@ -40,7 +40,7 @@ Pump, Support, Library">
 <h2 id="ltn12">LTN12</h2>
 
 <p> The <tt>ltn12</tt> namespace implements the ideas described in
-<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">
+<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">
 LTN012, Filters sources and sinks</a>. This manual simply describes the
 functions. Please refer to the LTN for a deeper explanation of the
 functionality provided by this module.

docs/socket.html

@@ -164,9 +164,6 @@ Creates and returns a <em>clean</em>
 <a href="#try"><tt>try</tt></a>
 function that allows for cleanup before the exception
 is  raised.
-This implements the ideas described in
-<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn013.md">
-LTN012, Using finalized exceptions</a>.
 </p>
 
 <p class="parameters">
@@ -210,9 +207,6 @@ Converts a function that throws exceptions into a safe function. This
 function only catches exceptions thrown by the <a href="#try"><tt>try</tt></a>
 and <a href="#newtry"><tt>newtry</tt></a> functions. It does not catch normal
 Lua errors.
-This implements the ideas described in
-<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn013.md">
-LTN012, Using finalized exceptions</a>.
 </p>
 
 <p class="parameters">
@@ -431,9 +425,6 @@ socket.<b>try(</b>ret<sub>1</sub> [, ret<sub>2</sub> ... ret<sub>N</sub>]<b>)</b
 Throws an exception in case <tt>ret<sub>1</sub></tt> is falsy, using
 <tt>ret<sub>2</sub></tt> as the error message. The exception is supposed to be caught
 by a <a href="#protect"><tt>protect</tt></a>ed function only.
-This implements the ideas described in
-<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn013.md">
-LTN012, Using finalized exceptions</a>.
 </p>
 
 <p class="parameters">

luasocket-scm-3.rockspec

@@ -69,7 +69,6 @@ local function make_plat(plat)
     ["socket.smtp"]    = "src/smtp.lua",
     ltn12              = "src/ltn12.lua",
     socket             = "src/socket.lua",
-    mbox               = "src/mbox.lua",
     mime               = "src/mime.lua"
   }
   if plat == "unix"

makefile.dist

@@ -1,7 +1,7 @@
 #--------------------------------------------------------------------------
 # Distribution makefile
 #--------------------------------------------------------------------------
-DIST = luasocket-3.1.0
+DIST = luasocket-3.0.0
 
 TEST = \
 	test/README \

src/http.lua

@@ -54,7 +54,7 @@ local function receiveheaders(sock, headers)
     while line ~= "" do
         -- get field-name and value
         name, value = socket.skip(2, string.find(line, "^(.-):%s*(.*)"))
-        if not (name and value) then return nil, "malformed response headers" end
+        if not (name and value) then return nil, "malformed reponse headers" end
         name = string.lower(name)
         -- get next line (value might be folded)
         line, err  = sock:receive()
@@ -62,7 +62,7 @@ local function receiveheaders(sock, headers)
         -- unfold any folded values
         while string.find(line, "^%s") do
             value = value .. line
-            line, err = sock:receive()
+            line = sock:receive()
             if err then return nil, err end
         end
         -- save pair in table
@@ -81,7 +81,7 @@ socket.sourcet["http-chunked"] = function(sock, headers)
         dirty = function() return sock:dirty() end
     }, {
         __call = function()
-            -- get chunk size, skip extension
+            -- get chunk size, skip extention
             local line, err = sock:receive()
             if err then return nil, err end
             local size = base.tonumber(string.gsub(line, ";.*", ""), 16)
@@ -219,11 +219,9 @@ local function adjustproxy(reqt)
     local proxy = reqt.proxy or _M.PROXY
     if proxy then
         proxy = url.parse(proxy)
-        proxy.port = proxy.port or 3128
+        return proxy.host, proxy.port or 3128
-        proxy.create = SCHEMES[proxy.scheme].create(reqt)
-        return proxy.host, proxy.port, proxy.create
     else
-        return reqt.host, reqt.port, reqt.create
+        return reqt.host, reqt.port
     end
 end
 
@@ -281,7 +279,7 @@ local function adjustrequest(reqt)
     if not (host and host ~= "") then
         socket.try(nil, "invalid host '" .. base.tostring(nreqt.host) .. "'")
     end
-    -- compute uri if user hasn't overridden
+    -- compute uri if user hasn't overriden
     nreqt.uri = reqt.uri or adjusturi(nreqt)
     -- adjust headers in request
     nreqt.headers = adjustheaders(nreqt)
@@ -293,10 +291,7 @@ local function adjustrequest(reqt)
     end
 
     -- ajust host and port if there is a proxy
-    local proxy_create
+    nreqt.host, nreqt.port = adjustproxy(nreqt)
-    nreqt.host, nreqt.port, proxy_create = adjustproxy(nreqt)
-    if not reqt.create then nreqt.create = proxy_create end
-
     return nreqt
 end
 

src/inet.c

@@ -290,7 +290,7 @@ int inet_meth_getsockname(lua_State *L, p_socket ps, int family)
         return 2;
     }
     lua_pushstring(L, name);
-    lua_pushinteger(L, (int) strtol(port, (char **) NULL, 10));
+    lua_pushstring(L, port);
     switch (family) {
         case AF_INET: lua_pushliteral(L, "inet"); break;
         case AF_INET6: lua_pushliteral(L, "inet6"); break;

src/luasocket.h

@@ -10,7 +10,7 @@
 /*-------------------------------------------------------------------------* \
 * Current socket library version
 \*-------------------------------------------------------------------------*/
-#define LUASOCKET_VERSION    "LuaSocket 3.1.0"
+#define LUASOCKET_VERSION    "LuaSocket 3.0.0"
 #define LUASOCKET_COPYRIGHT  "Copyright (C) 1999-2013 Diego Nehab"
 
 /*-------------------------------------------------------------------------*\

src/makefile

@@ -1,6 +1,6 @@
 # luasocket src/makefile
 #
-# Definitions in this section can be overridden on the command line or in the
+# Definitions in this section can be overriden on the command line or in the
 # environment.
 #
 # These are equivalent:
@@ -272,7 +272,7 @@ SOCKET_win64=wsocket.obj
 #
 SO=$(SO_$(PLAT))
 O=$(O_$(PLAT))
-SOCKET_V=3.1.0
+SOCKET_V=3.0.0
 MIME_V=1.0.3
 SOCKET_SO=socket-$(SOCKET_V).$(SO)
 MIME_SO=mime-$(MIME_V).$(SO)

src/pierror.h

@@ -12,7 +12,7 @@
 #define PIE_CONNREFUSED    "connection refused"
 #define PIE_CONNABORTED    "closed"
 #define PIE_CONNRESET      "closed"
-#define PIE_TIMEDOUT       "timeout"
+#define PIE_TIMEDOUT       "connection timeout"
 #define PIE_AGAIN          "temporary failure in name resolution"
 #define PIE_BADFLAGS       "invalid value for ai_flags"
 #define PIE_BADHINTS       "invalid value for hints"

src/smtp.lua

@@ -225,7 +225,7 @@ local function adjust_headers(mesgt)
     lower["date"] = lower["date"] or
         os.date("!%a, %d %b %Y %H:%M:%S ") .. (mesgt.zone or _M.ZONE)
     lower["x-mailer"] = lower["x-mailer"] or socket._VERSION
-    -- this can't be overridden
+    -- this can't be overriden
     lower["mime-version"] = "1.0"
     return lower
 end

src/url.lua

@@ -152,7 +152,7 @@ function _M.parse(url, default)
     url = string.gsub(url, "^([%w][%w%+%-%.]*)%:",
         function(s) parsed.scheme = s; return "" end)
     -- get authority
-    url = string.gsub(url, "^//([^/%?#]*)", function(n)
+    url = string.gsub(url, "^//([^/]*)", function(n)
         parsed.authority = n
         return ""
     end)

src/wsocket.c

@@ -262,7 +262,6 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got,
         if (err != WSAEWOULDBLOCK) {
             if (err != WSAECONNRESET || prev == WSAECONNRESET) return err;
             prev = err;
-            continue;
         }
         if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
     }
@@ -292,7 +291,6 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
         if (err != WSAEWOULDBLOCK) {
             if (err != WSAECONNRESET || prev == WSAECONNRESET) return err;
             prev = err;
-            continue;
         }
         if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
     }