Merge branch 'master' into hjelmeland-patch-1

Changed return text for ETIMEDOUT/ WSAETIMEDOUT
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”.
2025-07-13 06:04:31 +02:00 · 2023-11-10 09:12:04 +03:00 · 2015-09-03 15:24:22 +02:00
16 changed files with 170 additions and 148 deletions
--- a/docs/installation.html
+++ b/docs/installation.html
@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
    "http://www.w3.org/TR/html4/strict.dtd">
 <html>

 <head>
 <meta name="description" content="LuaSocket: Introduction to the core">
 <meta name="keywords" content="Lua, LuaSocket, TCP, UDP, Network, Support,
-Installation">
+Installation"> 
 <title>LuaSocket: Installation</title>
 <link rel="stylesheet" href="reference.css" type="text/css">
 </head>
@ -29,7 +29,7 @@ Installation">
 <a href="index.html#download">download</a> &middot;
 <a href="installation.html">installation</a> &middot;
 <a href="introduction.html">introduction</a> &middot;
-<a href="reference.html">reference</a>
+<a href="reference.html">reference</a> 
 </p>
 </center>
 <hr>
@ -48,8 +48,8 @@ will likely already have been answered.  </p>

 <p> On Unix systems, the standard distribution uses two base
 directories, one for system dependent files, and another for system
-independent files. Let's call these directories <tt>&lt;CDIR&gt;</tt>
-and <tt>&lt;LDIR&gt;</tt>, respectively.
+independent files. Let's call these directories <tt>&lt;CDIR&gt;</tt> 
+and <tt>&lt;LDIR&gt;</tt>, respectively. 
 For example, in my laptp, Lua&nbsp;5.1 is configured to
 use '<tt>/usr/local/lib/lua/5.1</tt>' for
 <tt>&lt;CDIR&gt;</tt> and '<tt>/usr/local/share/lua/5.1</tt>' for
@ -57,9 +57,9 @@ use '<tt>/usr/local/lib/lua/5.1</tt>' for
 usually points to the directory where the Lua executable is
 found, and <tt>&lt;LDIR&gt;</tt> points to a
 <tt>lua/</tt> directory inside <tt>&lt;CDIR&gt;</tt>. (These
-settings can be overridden by environment variables
+settings can be overridden by environment variables 
 <tt>LUA_PATH</tt> and <tt>LUA_CPATH</tt>. See the Lua
-documentation for details.) Here is the standard LuaSocket
+documentation for details.) Here is the standard LuaSocket 
 distribution directory structure:</p>

 <pre class=example>
@ -76,7 +76,7 @@ distribution directory structure:</p>
 </pre>

 <p> Naturally, on Unix systems, <tt>core.dll</tt>
-would be replaced by <tt>core.so</tt>.
+would be replaced by <tt>core.so</tt>.  
 </p>

 <h3>Using LuaSocket</h3>
@ -89,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
--- a/docs/introduction.html
+++ b/docs/introduction.html
@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
    "http://www.w3.org/TR/html4/strict.dtd">
 <html>

 <head>
 <meta name="description" content="LuaSocket: Introduction to the core">
 <meta name="keywords" content="Lua, LuaSocket, TCP, UDP, Network,
-Library, Support">
+Library, Support"> 
 <title>LuaSocket: Introduction to the core</title>
 <link rel="stylesheet" href="reference.css" type="text/css">
 </head>
@ -29,7 +29,7 @@ Library, Support">
 <a href="index.html#download">download</a> &middot;
 <a href="installation.html">installation</a> &middot;
 <a href="introduction.html">introduction</a> &middot;
-<a href="reference.html">reference</a>
+<a href="reference.html">reference</a> 
 </p>
 </center>
 <hr>
@ -61,23 +61,23 @@ interface to I/O across different domains and operating systems.
 The API design had two goals in mind. First, users
 experienced with the C API to sockets should feel comfortable using LuaSocket.
 Second, the simplicity and the feel of the Lua language should be
-preserved. To achieve these goals, the LuaSocket API keeps the function names and semantics the C API whenever possible, but their usage in Lua has been greatly simplified.
+preserved. To achieve these goals, the LuaSocket API keeps the function names and semantics the C API whenever possible, but their usage in Lua has been greatly simplified.  
 </p>


 <p>
 One of the simplifications is the receive pattern capability.
-Applications can read  data from stream domains (such as TCP)
+Applications can read  data from stream domains (such as TCP) 
 line  by line, block  by block, or until the connection  is closed.
 All I/O reads are buffered and the performance differences between
-different receive patterns are negligible.
+different receive patterns are negligible.  
 </p>

 <p>
 Another advantage is the flexible timeout control
 mechanism. As in C, all I/O  operations are blocking by default. For
-example, the  <a href=tcp.html#send><tt>send</tt></a>,
-<a href=tcp.html#receive><tt>receive</tt></a> and
+example, the  <a href=tcp.html#send><tt>send</tt></a>,  
+<a href=tcp.html#receive><tt>receive</tt></a> and 
 <a href=tcp.html#accept><tt>accept</tt></a> methods
 of the TCP domain will block  the  caller application  until
 the operation  is completed (if ever!). However, with a call to the
@ -87,7 +87,7 @@ the time it can  be blocked by LuaSocket (the "<tt>total</tt>" timeout), on
 the time  LuaSocket can  internally be  blocked by  any OS call (the
 "<tt>block</tt>" timeout) or a combination of the  two.  Each LuaSocket
 call might perform several OS calls, so that the two timeout values are
-<em>not</em> equivalent.
+<em>not</em> equivalent.  
 </p>

 <p>
@ -95,10 +95,10 @@ Finally,  the host  name  resolution   is  transparent,  meaning  that  most
 functions and methods accept both  IP addresses and host names. In  case a
 host name is given, the  library  queries the  system's  resolver  and
 tries  the main IP address returned. Note that direct use of IP addresses
-is more efficient, of course. The
-<a href=dns.html#toip><tt>toip</tt></a>
-and <a href=dns.html#tohostname><tt>tohostname</tt></a>
-functions from the DNS module are provided to convert between host names and IP addresses.
+is more efficient, of course. The 
+<a href=dns.html#toip><tt>toip</tt></a> 
+and <a href=dns.html#tohostname><tt>tohostname</tt></a> 
+functions from the DNS module are provided to convert between host names and IP addresses. 
 </p>

 <p>
@ -118,47 +118,47 @@ reassembled transparently on  the other end. There are  no boundaries in
 the  data transfers.  The library  allows users  to read  data from  the
 sockets in  several different granularities: patterns  are available for
 lines, arbitrary sized blocks  or "read up to connection closed", all with
-good performance.
+good performance. 
 </p>

 <p>
-The library distinguishes  three types of TCP sockets:  <em>master</em>,
-<em>client</em> and <em>server</em> sockets.
+The library distinguishes  three types of TCP sockets:  <em>master</em>, 
+<em>client</em> and <em>server</em> sockets. 
 </p>

 <p>
 Master sockets are newly created TCP sockets returned by the function
-<a href=tcp.html#tcp><tt>socket.tcp</tt></a>. A master socket is
+<a href=tcp.html#tcp><tt>socket.tcp</tt></a>. A master socket is 
 transformed into a server socket
 after it is associated with a <em>local</em> address by a call to the
-<a href=tcp.html#bind><tt>bind</tt></a> method followed by a call to the
-<a href=tcp.html#listen><tt>listen</tt></a>. Conversely, a master socket
-can be changed into a client socket with the method
-<a href=tcp.html#connect><tt>connect</tt></a>,
-which associates it with a <em>remote</em> address.
+<a href=tcp.html#bind><tt>bind</tt></a> method followed by a call to the 
+<a href=tcp.html#listen><tt>listen</tt></a>. Conversely, a master socket 
+can be changed into a client socket with the method 
+<a href=tcp.html#connect><tt>connect</tt></a>, 
+which associates it with a <em>remote</em> address. 
 </p>

 <p>
-On server sockets, applications can use the
+On server sockets, applications can use the 
 <a href=tcp.html#accept><tt>accept</tt></a> method
 to wait for a client connection. Once a  connection is established, a
 client socket object  is  returned representing  this  connection.  The
 other methods available   for   server   socket  objects   are
-<a href=tcp.html#getsockname><tt>getsockname</tt></a>,
+<a href=tcp.html#getsockname><tt>getsockname</tt></a>,  
 <a href=tcp.html#setoption><tt>setoption</tt></a>,
-<a href=tcp.html#settimeout><tt>settimeout</tt></a>, and
-<a href=tcp.html#close><tt>close</tt></a>.
+<a href=tcp.html#settimeout><tt>settimeout</tt></a>, and 
+<a href=tcp.html#close><tt>close</tt></a>. 
 </p>

 <p>
 Client sockets are  used to exchange data between  two applications over
-the Internet. Applications can call the  methods
+the Internet. Applications can call the  methods 
 <a href=tcp.html#send><tt>send</tt></a> and
-<a href=tcp.html#receive><tt>receive</tt></a>
+<a href=tcp.html#receive><tt>receive</tt></a> 
 to send and  receive data.  The other methods
-available for  client socket objects are
+available for  client socket objects are 
 <a href=tcp.html#getsockname><tt>getsockname</tt></a>,
-<a href=tcp.html#getpeername><tt>getpeername</tt></a>,
+<a href=tcp.html#getpeername><tt>getpeername</tt></a>, 
 <a href=tcp.html#setoption><tt>setoption</tt></a>,
 <a href=tcp.html#settimeout><tt>settimeout</tt></a>,
 <a href=tcp.html#shutdown><tt>shutdown</tt></a>, and
@ -175,7 +175,7 @@ port (one that is chosen by the  operating system) on the local host and
 awaits client connections on that port. When a connection is established,
 the program reads a line from the  remote end and sends it back, closing
 the  connection immediately. You  can  test it  using the  telnet
-program.
+program. 
 </p>

 <pre class=example>
@ -217,68 +217,68 @@ error free. Data  transfers are atomic, one datagram at  a time. Reading
 only  part of  a  datagram discards  the  rest, so  that  the following read
 operation  will  act  on  the  next  datagram.  The  advantages  are  in
 simplicity (no connection  setup) and performance (no  error checking or
-error correction).
+error correction). 
 </p>

 <p>
 Note that although no guarantees are made, these days
-networks are so good that, under normal circumstances, few errors
+networks are so good that, under normal circumstances, few errors 
 happen in practice.
 </p>

 <p>
-An UDP socket object is  created by the
+An UDP socket object is  created by the 
 <a href=udp.html#udp><tt>socket.udp</tt></a> function. UDP
 sockets  do   not  need   to  be  connected   before  use.   The  method
-<a href=udp.html#sendto><tt>sendto</tt></a>
+<a href=udp.html#sendto><tt>sendto</tt></a>  
 can  be  used  immediately after  creation  to
 send  a datagram to  IP address and port. Host names  are not allowed
 because performing name resolution for each packet would be forbiddingly
-slow.  Methods
-<a href=udp.html#receive><tt>receive</tt></a>  and
+slow.  Methods 
+<a href=udp.html#receive><tt>receive</tt></a>  and 
 <a href=udp.html#receivefrom><tt>receivefrom</tt></a>
 can be used to retrieve datagrams, the latter returning the IP and port of
 the  sender  as  extra  return  values (thus being  slightly  less
-efficient).
+efficient). 
 </p>

 <p>
 When  communication  is performed  repeatedly  with  a single  peer,  an
-application  should call  the
+application  should call  the 
 <a href=udp.html#setpeername><tt>setpeername</tt></a> method to specify a
-permanent partner.  Methods
+permanent partner.  Methods 
 <a href=udp.html#sendto><tt>sendto</tt></a> and
-<a href=udp.html#receivefrom><tt>receivefrom</tt></a>
+<a href=udp.html#receivefrom><tt>receivefrom</tt></a> 
 can no longer be used, but the method
-<a href=udp.html#send><tt>send</tt></a> can be used to send data
-directly  to   the   peer, and the method
-<a href=udp.html#receive><tt>receive</tt></a>
+<a href=udp.html#send><tt>send</tt></a> can be used to send data 
+directly  to   the   peer, and the method 
+<a href=udp.html#receive><tt>receive</tt></a> 
 will  only return  datagrams originating
 from that peer. There is about 30% performance gain due to this practice.
 </p>

 <p>
-To associate  an UDP socket with  a local address, an  application calls the
-<a href=udp.html#setsockname><tt>setsockname</tt></a>
+To associate  an UDP socket with  a local address, an  application calls the   
+<a href=udp.html#setsockname><tt>setsockname</tt></a> 
 method <em>before</em> sending any datagrams.   Otherwise, the socket is
 automatically  bound  to an  ephemeral  address  before the  first  data
-transmission and once bound the local address cannot be changed.
+transmission and once bound the local address cannot be changed.  
 The   other  methods   available  for  UDP   sockets  are
-<a href=udp.html#getpeername><tt>getpeername</tt></a>,
-<a href=udp.html#getsockname><tt>getsockname</tt></a>,
+<a href=udp.html#getpeername><tt>getpeername</tt></a>,  
+<a href=udp.html#getsockname><tt>getsockname</tt></a>, 
 <a href=udp.html#settimeout><tt>settimeout</tt></a>,
-<a href=udp.html#setoption><tt>setoption</tt></a> and
-<a href=udp.html#close><tt>close</tt></a>.
+<a href=udp.html#setoption><tt>setoption</tt></a> and 
+<a href=udp.html#close><tt>close</tt></a>. 
 </p>

 <p>
-Example:
+Example: 
 </p>
 <blockquote>
 <p>
 A simple daytime client, using LuaSocket. The program connects to a remote
 server and tries to retrieve the daytime, printing the answer it got or an
-error message.
+error message. 
 </p>

 <pre class=example>
@ -301,11 +301,11 @@ io.write(assert(udp:receive()))

 <h3 id=more>Support modules</h3>

-<p> Although not covered in the introduction, LuaSocket offers
+<p> Although not covered in the introduction, LuaSocket offers 
 much more than TCP and UDP functionality. As the library
 evolved, support for <a href=http.html>HTTP</a>, <a href=ftp.html>FTP</a>,
 and <a href=smtp.html>SMTP</a> were built on top of these. These modules
-and many others are covered by the <a href=reference.html>reference manual</a>.
+and many others are covered by the <a href=reference.html>reference manual</a>. 
 </p>

 <!-- footer +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--- a/docs/ltn12.html
+++ b/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.
--- a/docs/socket.html
+++ b/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">
--- a/docs/url.html
+++ b/docs/url.html
@ -1,10 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
    "http://www.w3.org/TR/html4/strict.dtd">
 <html>

 <head>
 <meta name="description" content="LuaSocket: URL manipulation">
-<meta name="keywords" content="Lua, LuaSocket, URL, Library, Link, Network, Support">
+<meta name="keywords" content="Lua, LuaSocket, URL, Library, Link, Network, Support"> 
 <title>LuaSocket: URL support</title>
 <link rel="stylesheet" href="reference.css" type="text/css">
 </head>
@ -28,7 +28,7 @@
 <a href="index.html#download">download</a> &middot;
 <a href="installation.html">installation</a> &middot;
 <a href="introduction.html">introduction</a> &middot;
-<a href="reference.html">reference</a>
+<a href="reference.html">reference</a> 
 </p>
 </center>
 <hr>
@ -36,21 +36,21 @@

 <!-- url ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

-<h2 id="url">URL</h2>
+<h2 id="url">URL</h2> 

 <p>
 The  <tt>url</tt>  namespace provides  functions  to  parse,  protect,
 and build URLs, as well  as functions to compose  absolute URLs
-from base and relative URLs, according to
+from base and relative URLs, according to 
 <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>.
 </p>

-<p>
+<p> 
 To obtain the <tt>url</tt> namespace, run:
 </p>

 <pre class=example>
-- loads the URL module
+-- loads the URL module 
 local url = require("socket.url")
 </pre>

@ -60,7 +60,7 @@ An URL is defined by the following grammar:

 <blockquote>
 <tt>
-&lt;url&gt; ::= [&lt;scheme&gt;:][//&lt;authority&gt;][/&lt;path&gt;][?&lt;query&gt;][#&lt;fragment&gt;]<br>
+&lt;url&gt; ::= [&lt;scheme&gt;:][//&lt;authority&gt;][/&lt;path&gt;][;&lt;params&gt;][?&lt;query&gt;][#&lt;fragment&gt;]<br>
 &lt;authority&gt; ::= [&lt;userinfo&gt;@]&lt;host&gt;[:&lt;port&gt;]<br>
 &lt;userinfo&gt; ::= &lt;user&gt;[:&lt;password&gt;]<br>
 &lt;path&gt; ::= {&lt;segment&gt;/}&lt;segment&gt;<br>
@ -74,7 +74,7 @@ url.<b>absolute(</b>base, relative<b>)</b>
 </p>

 <p class=description>
-Builds an absolute URL from a base URL and a relative URL.
+Builds an absolute URL from a base URL and a relative URL. 
 </p>

 <p class=parameters>
@ -130,14 +130,14 @@ url.<b>build(</b>parsed_url<b>)</b>
 </p>

 <p class=description>
-Rebuilds an URL from its parts.
+Rebuilds an URL from its parts. 
 </p>

 <p class=parameters>
 <tt>Parsed_url</tt> is a table with same components returned by
 <a href="#parse"><tt>parse</tt></a>.
 Lower level components, if specified,
-take  precedence over  high level  components of  the URL grammar.
+take  precedence over  high level  components of  the URL grammar. 
 </p>

 <p class=return>
@ -152,10 +152,10 @@ url.<b>build_path(</b>segments, unsafe<b>)</b>

 <p class=description>
 Builds a <tt>&lt;path&gt;</tt> component from  a list of
-<tt>&lt;segment&gt;</tt> parts.
+<tt>&lt;segment&gt;</tt> parts. 
 Before composition, any reserved characters found in a segment are escaped into
 their protected  form, so that  the resulting path  is a valid  URL path
-component.
+component.  
 </p>

 <p class=parameters>
@ -165,8 +165,8 @@ characters are left untouched.
 </p>

 <p class=return>
-The  function  returns   a string with the
-built <tt>&lt;path&gt;</tt> component.
+The  function  returns   a string with the  
+built <tt>&lt;path&gt;</tt> component. 
 </p>

 <!-- escape +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
@ -178,7 +178,7 @@ url.<b>escape(</b>content<b>)</b>
 <p class=description>
 Applies the URL escaping content coding to a string
 Each byte is encoded as a percent character followed
-by the two byte hexadecimal representation of its integer
+by the two byte hexadecimal representation of its integer 
 value.
 </p>

@ -225,6 +225,7 @@ parsed_url = {<br>
 &nbsp;&nbsp;scheme = <i>string</i>,<br>
 &nbsp;&nbsp;authority = <i>string</i>,<br>
 &nbsp;&nbsp;path = <i>string</i>,<br>
+&nbsp;&nbsp;params = <i>string</i>,<br>
 &nbsp;&nbsp;query = <i>string</i>,<br>
 &nbsp;&nbsp;fragment = <i>string</i>,<br>
 &nbsp;&nbsp;userinfo = <i>string</i>,<br>
@ -254,6 +255,7 @@ parsed_url = url.parse("ftp://root:passwd@unsafe.org/pub/virus.exe;type=i")
 --   scheme = "ftp",
 --   authority = "root:passwd@unsafe.org",
 --   path = "/pub/virus.exe",
+--   params = "type=i",
 --   userinfo = "root:passwd",
 --   host = "unsafe.org",
 --   user = "root",
@ -268,8 +270,8 @@ url.<b>parse_path(</b>path<b>)</b>
 </p>

 <p class=description>
-Breaks a <tt>&lt;path&gt;</tt> URL component into all its
-<tt>&lt;segment&gt;</tt> parts.
+Breaks a <tt>&lt;path&gt;</tt> URL component into all its 
+<tt>&lt;segment&gt;</tt> parts. 
 </p>

 <p class=description>
@ -280,7 +282,7 @@ Breaks a <tt>&lt;path&gt;</tt> URL component into all its
 Since  some characters   are   reserved   in   URLs,  they must be escaped
 whenever present in a <tt>&lt;path&gt;</tt> component. Therefore, before
 returning a list with all the parsed segments, the function removes
-escaping from all of them.
+escaping from all of them. 
 </p>

 <!-- unescape +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
@ -298,7 +300,7 @@ Removes  the   URL   escaping    content   coding   from   a string.
 </p>

 <p class=return>
-The function returns the decoded string.
+The function returns the decoded string. 
 </p>

 <!-- footer +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--- a/luasocket-scm-3.rockspec
+++ b/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"
--- a/makefile.dist
+++ b/makefile.dist
@ -1,7 +1,7 @@
 #--------------------------------------------------------------------------
 # Distribution makefile
 #--------------------------------------------------------------------------
-DIST = luasocket-3.1.0
+DIST = luasocket-3.0.0

 TEST = \
 	test/README \
--- a/src/http.lua
+++ b/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)
@ -207,6 +207,7 @@ local function adjusturi(reqt)
    if not reqt.proxy and not _M.PROXY then
        u = {
           path = socket.try(reqt.path, "invalid path 'nil'"),
+           params = reqt.params,
           query = reqt.query,
           fragment = reqt.fragment
        }
@ -218,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
-        proxy.create = SCHEMES[proxy.scheme].create(reqt)
-        return proxy.host, proxy.port, proxy.create
+        return proxy.host, proxy.port or 3128
    else
-        return reqt.host, reqt.port, reqt.create
+        return reqt.host, reqt.port
    end
 end

@ -280,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)
@ -292,10 +291,7 @@ local function adjustrequest(reqt)
    end

    -- ajust host and port if there is a proxy
-    local proxy_create
-    nreqt.host, nreqt.port, proxy_create = adjustproxy(nreqt)
-    if not reqt.create then nreqt.create = proxy_create end
-
+    nreqt.host, nreqt.port = adjustproxy(nreqt)
    return nreqt
 end

--- a/src/inet.c
+++ b/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;
--- a/src/luasocket.h
+++ b/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"

 /*-------------------------------------------------------------------------*\
--- a/src/makefile
+++ b/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)
--- a/src/pierror.h
+++ b/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"
--- a/src/smtp.lua
+++ b/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
@ -253,4 +253,4 @@ _M.send = socket.protect(function(mailt)
    return s:close()
 end)

-return _M
+return _M
--- a/src/url.lua
+++ b/src/url.lua
@ -125,7 +125,7 @@ end
 -----------------------------------------------------------------------------
 -- Parses a url and returns a table with all its parts according to RFC 2396
 -- The following grammar describes the names given to the URL parts
-- <url> ::= <scheme>://<authority>/<path>?<query>#<fragment>
+-- <url> ::= <scheme>://<authority>/<path>;<params>?<query>#<fragment>
 -- <authority> ::= <userinfo>@<host>:<port>
 -- <userinfo> ::= <user>[:<password>]
 -- <path> :: = {<segment>/}<segment>
@ -136,7 +136,7 @@ end
 --   table with the following fields, where RFC naming conventions have
 --   been preserved:
 --     scheme, authority, userinfo, user, password, host, port,
--     path, query, fragment
+--     path, params, query, fragment
 -- Obs:
 --   the leading '/' in {/<path>} is considered part of <path>
 -----------------------------------------------------------------------------
@ -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)
@ -166,6 +166,11 @@ function _M.parse(url, default)
        parsed.query = q
        return ""
    end)
+    -- get params
+    url = string.gsub(url, "%;(.*)", function(p)
+        parsed.params = p
+        return ""
+    end)
    -- path is whatever was left
    if url ~= "" then parsed.path = url end
    local authority = parsed.authority
@ -198,6 +203,7 @@ function _M.build(parsed)
    --local ppath = _M.parse_path(parsed.path or "")
    --local url = _M.build_path(ppath)
    local url = parsed.path or ""
+    if parsed.params then url = url .. ";" .. parsed.params end
    if parsed.query then url = url .. "?" .. parsed.query end
    local authority = parsed.authority
    if parsed.host then
@ -252,8 +258,11 @@ function _M.absolute(base_url, relative_url)
            relative_parsed.authority = base_parsed.authority
            if not relative_parsed.path then
                relative_parsed.path = base_parsed.path
-                if not relative_parsed.query then
-                    relative_parsed.query = base_parsed.query
+                if not relative_parsed.params then
+                    relative_parsed.params = base_parsed.params
+                    if not relative_parsed.query then
+                        relative_parsed.query = base_parsed.query
+                    end
                end
            else
                relative_parsed.path = absolute_path(base_parsed.path or "",
--- a/src/wsocket.c
+++ b/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;
    }
--- a/test/urltest.lua
+++ b/test/urltest.lua
@ -99,7 +99,8 @@ check_parse_url{
    userinfo = "user:pass$%?#wd",
    password = "pass$%?#wd",
    user = "user",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -112,7 +113,8 @@ check_parse_url{
    userinfo = "user:pass?#wd",
    password = "pass?#wd",
    user = "user",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -125,7 +127,8 @@ check_parse_url{
    userinfo = "user:pass-wd",
    password = "pass-wd",
    user = "user",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -138,7 +141,8 @@ check_parse_url{
    userinfo = "user:pass#wd",
    password = "pass#wd",
    user = "user",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -151,7 +155,8 @@ check_parse_url{
    userinfo = "user:pass#wd",
    password = "pass#wd",
    user = "user",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
 }
 check_parse_url{
@ -162,7 +167,8 @@ check_parse_url{
    port = "port",
    userinfo = "userinfo",
    user = "userinfo",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -176,7 +182,8 @@ check_parse_url{
    userinfo = "user:password",
    user = "user",
    password = "password",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment",
 }
@ -189,7 +196,8 @@ check_parse_url{
    port = "port",
    userinfo = "userinfo",
    user = "userinfo",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = ""
 }
@ -202,7 +210,8 @@ check_parse_url{
    port = "port",
    userinfo = "userinfo",
    user = "userinfo",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "",
    fragment = "fragment"
 }
@ -215,7 +224,8 @@ check_parse_url{
    port = "port",
    userinfo = "userinfo",
    user = "userinfo",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    fragment = "fragment"
 }

@ -227,7 +237,8 @@ check_parse_url{
    port = "port",
    userinfo = "userinfo",
    user = "userinfo",
-    path = "/path;",
+    path = "/path",
+    params = "",
    query = "query",
    fragment = "fragment"
 }
@ -253,7 +264,8 @@ check_parse_url{
    port = "port",
    userinfo = "userinfo",
    user = "userinfo",
-    path = "/;params",
+    path = "/",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -275,7 +287,8 @@ check_parse_url{
    port = "port",
    userinfo = "userinfo",
    user = "userinfo",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -425,7 +438,8 @@ check_parse_url{
    port = "port",
    userinfo = "userinfo",
    user = "userinfo",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -439,7 +453,8 @@ check_parse_url{
    userinfo = "user:password",
    user = "user",
    password = "password",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -452,7 +467,8 @@ check_build_url {
    port = "port",
    user = "user",
    password = "password",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -462,7 +478,8 @@ check_build_url{
    host = "::FFFF:129.144.52.38",
    port = "port",
    user = "userinfo",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -474,7 +491,8 @@ check_build_url{
    port = "port",
    user = "user",
    password = "password",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -485,7 +503,8 @@ check_build_url {
    host = "host",
    user = "user",
    password = "password",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -495,7 +514,8 @@ check_build_url {
    scheme = "scheme",
    host = "host",
    user = "user",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -504,7 +524,8 @@ check_build_url {
    url = "scheme://host/path;params?query#fragment",
    scheme = "scheme",
    host = "host",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -513,7 +534,8 @@ check_build_url {
    url = "scheme://host/path;params#fragment",
    scheme = "scheme",
    host = "host",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    fragment = "fragment"
 }

@ -551,7 +573,9 @@ check_build_url {
    user = "user",
    userinfo = "not used",
    password = "password",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
+    query = "query",
    fragment = "fragment"
 }

@ -564,7 +588,8 @@ check_build_url {
    userinfo = "not used",
    authority = "not used",
    password = "password",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -576,7 +601,8 @@ check_build_url {
    port = "port",
    userinfo = "user:password",
    authority = "not used",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }
@ -585,7 +611,8 @@ check_build_url {
    url = "scheme://user:password@host:port/path;params?query#fragment",
    scheme = "scheme",
    authority = "user:password@host:port",
-    path = "/path;params",
+    path = "/path",
+    params = "params",
    query = "query",
    fragment = "fragment"
 }