Merge e8e2ff5915 into 1fad162690

Co-authored-by: Thijs Schreijer <thijs@thijsschreijer.nl>

docs/ftp.html

@@ -55,7 +55,7 @@ protocol.  For that, check the implementation.
 
 <p>
 To really benefit from this module, a good understanding of
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">
 LTN012, Filters sources and sinks</a> is necessary.
 </p>
 
@@ -122,7 +122,7 @@ expects at least the fields <tt>host</tt>, <tt>sink</tt>, and one of
 <tt>argument</tt> or <tt>path</tt> (<tt>argument</tt> takes
 precedence). <tt>Host</tt> is the server to connect to. <tt>Sink</tt> is
 the <em>simple</em>
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 sink that will receive the downloaded data. <tt>Argument</tt> or
 <tt>path</tt> give the target path to the resource in the server. The
 optional arguments are the following:
@@ -136,7 +136,7 @@ authentication. Defaults to "<tt>ftp:anonymous@anonymous.org</tt>";</li>
 <li><tt>type</tt>: The transfer mode. Can take values "<tt>i</tt>" or
 "<tt>a</tt>". Defaults to whatever is the server default;</li>
 <li><tt>step</tt>:
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 pump step function used to pass data from the
 server to the sink. Defaults to the LTN12 <tt>pump.step</tt> function;</li>
 <li><tt>create</tt>: An optional function to be used instead of
@@ -206,7 +206,7 @@ expects at least the fields <tt>host</tt>, <tt>source</tt>, and one of
 <tt>argument</tt> or <tt>path</tt> (<tt>argument</tt> takes
 precedence). <tt>Host</tt> is the server to connect to. <tt>Source</tt> is
 the <em>simple</em>
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 source that will provide the contents to be uploaded.
 <tt>Argument</tt> or
 <tt>path</tt> give the target path to the resource in the server. The
@@ -221,7 +221,7 @@ authentication. Defaults to "<tt>ftp:anonymous@anonymous.org</tt>";</li>
 <li><tt>type</tt>: The transfer mode. Can take values "<tt>i</tt>" or
 "<tt>a</tt>". Defaults to whatever is the server default;</li>
 <li><tt>step</tt>:
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 pump step function used to pass data from the
 server to the sink. Defaults to the LTN12 <tt>pump.step</tt> function;</li>
 <li><tt>create</tt>: An optional function to be used instead of

docs/http.html

@@ -52,7 +52,7 @@ implementation    conforms     to    the    HTTP/1.1     standard,
 The module exports functions that provide HTTP functionality in different
 levels of abstraction. From the simple
 string oriented requests, through generic
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a> based, down to even lower-level if you bother to look through the source code.
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a> based, down to even lower-level if you bother to look through the source code.
 </p>
 
 <p>
@@ -144,7 +144,7 @@ http.<b>request{</b><br>
 The request function has two forms. The simple form downloads
 a URL using the <tt>GET</tt> or <tt>POST</tt> method and is based
 on strings. The generic form performs any HTTP method and is
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a> based.
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a> based.
 </p>
 
 <p class="parameters">
@@ -158,7 +158,7 @@ in the <tt>url</tt>. Otherwise, it performs a <tt>GET</tt> in the
 <p class="parameters">
 If the first argument is instead a table, the most important fields are
 the <tt>url</tt> and the <em>simple</em>
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 <tt>sink</tt> that will receive the downloaded content.
 Any part of the <tt>url</tt> can be overridden by including
 the appropriate field in the request table.
@@ -172,13 +172,13 @@ following:
 <li><tt>method</tt>: The HTTP request method. Defaults to "GET";</li>
 <li><tt>headers</tt>: Any additional HTTP headers to send with the request;</li>
 <li><tt>source</tt>: <em>simple</em>
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 source to provide the request body. If there
 is a body, you need to provide an appropriate "<tt>content-length</tt>"
 request header field, or the function will attempt to send the body as
 "<tt>chunked</tt>" (something few servers support). Defaults to the empty source;</li>
 <li><tt>step</tt>:
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 pump step function used to move data.
 Defaults to the LTN12 <tt>pump.step</tt> function.</li>
 <li><tt>proxy</tt>: The URL of a proxy server to use. Defaults to no proxy;</li>

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.0.0
+--&gt; LuaSocket 3.1.0
 </pre>
 
 <p> Each module loads their dependencies automatically, so you only need to

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 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

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="http://lua-users.org/wiki/FiltersSourcesAndSinks">
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">
 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/mime.html

@@ -54,7 +54,7 @@ MIME is described mainly in
 <p>
 All functionality provided by the MIME module
 follows the ideas presented in
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">
 LTN012, Filters sources and sinks</a>.
 </p>
 

docs/smtp.html

@@ -57,7 +57,7 @@ of the MIME standard, but described mainly
 in <a href="http://www.ietf.org/rfc/rfc2046.txt">RFC 2046</a>.</p>
 
 <p> In the description below, good understanding of <a
-href="http://lua-users.org/wiki/FiltersSourcesAndSinks"> LTN012, Filters
+href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md"> LTN012, Filters
 sources and sinks</a> and the  <a href="mime.html">MIME</a> module is
 assumed.  In fact, the SMTP module was the main reason for their
 creation. </p>
@@ -122,7 +122,7 @@ smtp.<b>message(</b>mesgt<b>)</b>
 
 <p class="description">
 Returns a <em>simple</em>
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a> source that sends an SMTP message body, possibly multipart (arbitrarily deep).
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a> source that sends an SMTP message body, possibly multipart (arbitrarily deep).
 </p>
 
 <p class="parameters">
@@ -155,7 +155,7 @@ multipart-mesgt = {<br>
 For a simple message, all that is needed is a set of <tt>headers</tt>
 and the <tt>body</tt>. The message <tt>body</tt> can be given as a string
 or as a <em>simple</em>
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 source. For multipart messages, the body is a table that
 recursively defines each part as an independent message, plus an optional
 <tt>preamble</tt> and <tt>epilogue</tt>.
@@ -163,7 +163,7 @@ recursively defines each part as an independent message, plus an optional
 
 <p class="return">
 The function returns a <em>simple</em>
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 source that produces the
 message contents as defined by <tt>mesgt</tt>, chunk by chunk.
 Hopefully, the following
@@ -264,7 +264,7 @@ The sender is given by the e-mail address in the <tt>from</tt> field.
 address, or a string
 in case there is just one recipient.
 The contents of the message are given by a <em>simple</em>
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 <tt>source</tt>. Several arguments are optional:
 </p>
 <ul>
@@ -276,7 +276,7 @@ methods if supported by the server (both are unsafe);</li>
 <li> <tt>domain</tt>: Domain name used to greet the server; Defaults to the
 local machine host name;</li>
 <li> <tt>step</tt>:
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 pump step function used to pass data from the
 source to the server. Defaults to the LTN12 <tt>pump.step</tt> function;</li>
 <li><tt>create</tt>: An optional function to be used instead of
@@ -308,7 +308,7 @@ Only recipients specified in the <tt>rcpt</tt> list will receive a copy of the
 message.  Each recipient of an SMTP mail message receives a copy of the
 message body along with the headers, and nothing more.  The headers
 <em>are</em> part of the message and should be produced by the
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 <tt>source</tt> function. The <tt>rcpt</tt> list is <em>not</em>
 part of the message and will not be sent to anyone.
 </p>

docs/socket.html

@@ -164,6 +164,9 @@ 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">
@@ -207,6 +210,9 @@ 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">
@@ -305,7 +311,7 @@ socket.<b>sink(</b>mode, socket<b>)</b>
 
 <p class="description">
 Creates an
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 sink from a stream socket object.
 </p>
 
@@ -380,7 +386,7 @@ socket.<b>source(</b>mode, socket [, length]<b>)</b>
 
 <p class="description">
 Creates an
-<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a>
+<a href="https://github.com/lunarmodules/luasocket/blob/master/ltn012.md">LTN12</a>
 source from a stream socket object.
 </p>
 
@@ -425,6 +431,9 @@ 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">

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>
 
@@ -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>
 
@@ -270,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>
@@ -282,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 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
@@ -300,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 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

luasocket-scm-3.rockspec

@@ -69,6 +69,7 @@ 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.0.0
+DIST = luasocket-3.1.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 reponse headers" end
+        if not (name and value) then return nil, "malformed response 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 = sock:receive()
+            line, err = 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 extention
+            -- get chunk size, skip extension
             local line, err = sock:receive()
             if err then return nil, err end
             local size = base.tonumber(string.gsub(line, ";.*", ""), 16)
@@ -219,15 +219,21 @@ local function adjustproxy(reqt)
     local proxy = reqt.proxy or _M.PROXY
     if proxy then
         proxy = url.parse(proxy)
-        return proxy.host, proxy.port or 3128
+        proxy.port = proxy.port or 3128
+        proxy.create = SCHEMES[proxy.scheme].create(reqt)
+        return proxy.host, proxy.port, proxy.create
     else
-        return reqt.host, reqt.port
+        return reqt.host, reqt.port, reqt.create
     end
 end
 
 local function adjustheaders(reqt)
     -- default headers
     local host = reqt.host
+    --ipv6 host address must be in []
+    if host:find(":", 1, true) then
+      host = "["..host.."]"
+    end
     local port = tostring(reqt.port)
     if port ~= tostring(SCHEMES[reqt.scheme].port) then
         host = host .. ':' .. port end
@@ -279,7 +285,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 overriden
+    -- compute uri if user hasn't overridden
     nreqt.uri = reqt.uri or adjusturi(nreqt)
     -- adjust headers in request
     nreqt.headers = adjustheaders(nreqt)
@@ -291,7 +297,10 @@ local function adjustrequest(reqt)
     end
 
     -- ajust host and port if there is a proxy
-    nreqt.host, nreqt.port = adjustproxy(nreqt)
+    local proxy_create
+    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_pushstring(L, port);
+    lua_pushinteger(L, (int) strtol(port, (char **) NULL, 10));
     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.0.0"
+#define LUASOCKET_VERSION    "LuaSocket 3.1.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 overriden on the command line or in the
+# Definitions in this section can be overridden 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.0.0
+SOCKET_V=3.1.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       "connection timeout"
+#define PIE_TIMEDOUT       "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 overriden
+    -- this can't be overridden
     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

src/unixdgram.c

@@ -16,13 +16,6 @@
 
 #define UNIXDGRAM_DATAGRAMSIZE 8192
 
-/* provide a SUN_LEN macro if sys/un.h doesn't (e.g. Android) */
-#ifndef SUN_LEN
-#define SUN_LEN(ptr) \
-  ((size_t) (((struct sockaddr_un *) 0)->sun_path)  \
-   + strlen ((ptr)->sun_path))
-#endif
-
 /*=========================================================================*\
 * Internal function prototypes
 \*=========================================================================*/
@@ -42,8 +35,8 @@ static int meth_receivefrom(lua_State *L);
 static int meth_sendto(lua_State *L);
 static int meth_getsockname(lua_State *L);
 
-static const char *unixdgram_tryconnect(p_unix un, const char *path);
-static const char *unixdgram_trybind(p_unix un, const char *path);
+static const char *unixdgram_tryconnect(p_unix un, const char *path, size_t len);
+static const char *unixdgram_trybind(p_unix un, const char *path, size_t len);
 
 /* unixdgram object methods */
 static luaL_Reg unixdgram_methods[] = {
@@ -133,13 +126,12 @@ static int meth_send(lua_State *L)
 static int meth_sendto(lua_State *L)
 {
     p_unix un = (p_unix) auxiliar_checkclass(L, "unixdgram{unconnected}", 1);
-    size_t count, sent = 0;
+    size_t count, sent, len = 0;
     const char *data = luaL_checklstring(L, 2, &count);
-    const char *path = luaL_checkstring(L, 3);
+    const char *path = luaL_checklstring(L, 3, &len);
     p_timeout tm = &un->tm;
     int err;
     struct sockaddr_un remote;
-    size_t len = strlen(path);
 
     if (len >= sizeof(remote.sun_path)) {
 		lua_pushnil(L);
@@ -148,7 +140,7 @@ static int meth_sendto(lua_State *L)
 	}
 
     memset(&remote, 0, sizeof(remote));
-    strcpy(remote.sun_path, path);
+    memcpy(remote.sun_path, path, len);
     remote.sun_family = AF_UNIX;
     timeout_markstart(tm);
 #ifdef UNIX_HAS_SUN_LEN
@@ -264,18 +256,22 @@ static int meth_dirty(lua_State *L) {
 /*-------------------------------------------------------------------------*\
 * Binds an object to an address
 \*-------------------------------------------------------------------------*/
-static const char *unixdgram_trybind(p_unix un, const char *path) {
+static const char *unixdgram_trybind(p_unix un, const char *path, size_t len) {
     struct sockaddr_un local;
-    size_t len = strlen(path);
+    int err;
     if (len >= sizeof(local.sun_path)) return "path too long";
     memset(&local, 0, sizeof(local));
-    strcpy(local.sun_path, path);
+    memcpy(local.sun_path, path, len);
     local.sun_family = AF_UNIX;
-    size_t addrlen = SUN_LEN(&local);
 #ifdef UNIX_HAS_SUN_LEN
-    local.sun_len = addrlen + 1;
+    local.sun_len = sizeof(local.sun_family) + sizeof(local.sun_len)
+        + len + 1;
+    err = socket_bind(&un->sock, (SA *) &local, local.sun_len);
+
+#else
+    err = socket_bind(&un->sock, (SA *) &local,
+            sizeof(local.sun_family) + len);
 #endif
-    int err = socket_bind(&un->sock, (SA *) &local, addrlen);
     if (err != IO_DONE) socket_destroy(&un->sock);
     return socket_strerror(err);
 }
@@ -283,8 +279,9 @@ static const char *unixdgram_trybind(p_unix un, const char *path) {
 static int meth_bind(lua_State *L)
 {
     p_unix un = (p_unix) auxiliar_checkclass(L, "unixdgram{unconnected}", 1);
-    const char *path =  luaL_checkstring(L, 2);
-    const char *err = unixdgram_trybind(un, path);
+    size_t len;
+    const char *path =  luaL_checklstring(L, 2, &len);
+    const char *err = unixdgram_trybind(un, path, len);
     if (err) {
         lua_pushnil(L);
         lua_pushstring(L, err);
@@ -313,20 +310,23 @@ static int meth_getsockname(lua_State *L)
 /*-------------------------------------------------------------------------*\
 * Turns a master unixdgram object into a client object.
 \*-------------------------------------------------------------------------*/
-static const char *unixdgram_tryconnect(p_unix un, const char *path)
+static const char *unixdgram_tryconnect(p_unix un, const char *path, size_t len)
 {
     struct sockaddr_un remote;
-    size_t len = strlen(path);
+    int err;
     if (len >= sizeof(remote.sun_path)) return "path too long";
     memset(&remote, 0, sizeof(remote));
-    strcpy(remote.sun_path, path);
+    memcpy(remote.sun_path, path, len);
     remote.sun_family = AF_UNIX;
     timeout_markstart(&un->tm);
-    size_t addrlen = SUN_LEN(&remote);
 #ifdef UNIX_HAS_SUN_LEN
-    remote.sun_len = addrlen + 1;
+    remote.sun_len = sizeof(remote.sun_family) + sizeof(remote.sun_len)
+        + len + 1;
+    err = socket_connect(&un->sock, (SA *) &remote, remote.sun_len, &un->tm);
+#else
+    err = socket_connect(&un->sock, (SA *) &remote,
+            sizeof(remote.sun_family) + len, &un->tm);
 #endif
-    int err = socket_connect(&un->sock, (SA *) &remote, addrlen, &un->tm);
     if (err != IO_DONE) socket_destroy(&un->sock);
     return socket_strerror(err);
 }
@@ -334,8 +334,9 @@ static const char *unixdgram_tryconnect(p_unix un, const char *path)
 static int meth_connect(lua_State *L)
 {
     p_unix un = (p_unix) auxiliar_checkgroup(L, "unixdgram{any}", 1);
-    const char *path =  luaL_checkstring(L, 2);
-    const char *err = unixdgram_tryconnect(un, path);
+    size_t len;
+    const char *path =  luaL_checklstring(L, 2, &len);
+    const char *err = unixdgram_tryconnect(un, path, len);
     if (err) {
         lua_pushnil(L);
         lua_pushstring(L, err);

src/unixstream.c

@@ -33,8 +33,8 @@ static int meth_getstats(lua_State *L);
 static int meth_setstats(lua_State *L);
 static int meth_getsockname(lua_State *L);
 
-static const char *unixstream_tryconnect(p_unix un, const char *path);
-static const char *unixstream_trybind(p_unix un, const char *path);
+static const char *unixstream_tryconnect(p_unix un, const char *path, size_t len);
+static const char *unixstream_trybind(p_unix un, const char *path, size_t len);
 
 /* unixstream object methods */
 static luaL_Reg unixstream_methods[] = {
@@ -181,13 +181,12 @@ static int meth_accept(lua_State *L) {
 /*-------------------------------------------------------------------------*\
 * Binds an object to an address
 \*-------------------------------------------------------------------------*/
-static const char *unixstream_trybind(p_unix un, const char *path) {
+static const char *unixstream_trybind(p_unix un, const char *path, size_t len) {
     struct sockaddr_un local;
-    size_t len = strlen(path);
     int err;
     if (len >= sizeof(local.sun_path)) return "path too long";
     memset(&local, 0, sizeof(local));
-    strcpy(local.sun_path, path);
+    memcpy(local.sun_path, path, len);
     local.sun_family = AF_UNIX;
 #ifdef UNIX_HAS_SUN_LEN
     local.sun_len = sizeof(local.sun_family) + sizeof(local.sun_len)
@@ -204,8 +203,9 @@ static const char *unixstream_trybind(p_unix un, const char *path) {
 
 static int meth_bind(lua_State *L) {
     p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{master}", 1);
-    const char *path =  luaL_checkstring(L, 2);
-    const char *err = unixstream_trybind(un, path);
+    size_t len;
+    const char *path =  luaL_checklstring(L, 2, &len);
+    const char *err = unixstream_trybind(un, path, len);
     if (err) {
         lua_pushnil(L);
         lua_pushstring(L, err);
@@ -234,14 +234,13 @@ static int meth_getsockname(lua_State *L)
 /*-------------------------------------------------------------------------*\
 * Turns a master unixstream object into a client object.
 \*-------------------------------------------------------------------------*/
-static const char *unixstream_tryconnect(p_unix un, const char *path)
+static const char *unixstream_tryconnect(p_unix un, const char *path, size_t len)
 {
     struct sockaddr_un remote;
     int err;
-    size_t len = strlen(path);
     if (len >= sizeof(remote.sun_path)) return "path too long";
     memset(&remote, 0, sizeof(remote));
-    strcpy(remote.sun_path, path);
+    memcpy(remote.sun_path, path, len);
     remote.sun_family = AF_UNIX;
     timeout_markstart(&un->tm);
 #ifdef UNIX_HAS_SUN_LEN
@@ -259,8 +258,9 @@ static const char *unixstream_tryconnect(p_unix un, const char *path)
 static int meth_connect(lua_State *L)
 {
     p_unix un = (p_unix) auxiliar_checkclass(L, "unixstream{master}", 1);
-    const char *path =  luaL_checkstring(L, 2);
-    const char *err = unixstream_tryconnect(un, path);
+    size_t len;
+    const char *path =  luaL_checklstring(L, 2, &len);
+    const char *err = unixstream_tryconnect(un, path, len);
     if (err) {
         lua_pushnil(L);
         lua_pushstring(L, err);

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,6 +262,7 @@ 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;
     }
@@ -291,6 +292,7 @@ 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;
     }