Merge 0.9->0.10
|
Kim Alvefur |
Fri, 22 Jan 2016 14:49:05 +0100 |
server_select: Add logging of when servers are paused and resumed
|
Kim Alvefur |
Fri, 22 Jan 2016 02:00:43 +0100 |
server_select: Pause and mark server as full if accepting a client fails (fixes #597)
|
Kim Alvefur |
Fri, 22 Jan 2016 02:00:27 +0100 |
server_select: Retry accepting clients from full servers after 10s (matches libevent behaviour)
|
Kim Alvefur |
Fri, 22 Jan 2016 01:59:25 +0100 |
server_select: Keep track of which server listeners are full
|
Kim Alvefur |
Fri, 22 Jan 2016 01:58:39 +0100 |
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 10 Jan 2016 03:57:17 +0100 |
net.server_select: Add 'server' method to client connections (present in server_event)
|
Kim Alvefur |
Sat, 09 Jan 2016 23:54:19 +0100 |
Merge 0.10->trunk
|
Matthew Wild |
Mon, 04 Jan 2016 09:09:15 +0000 |
server_select: Forward the actual TLS handshake error message
|
Kim Alvefur |
Sun, 03 Jan 2016 17:19:14 +0100 |
Merge 0.10->trunk
|
Matthew Wild |
Sat, 02 Jan 2016 20:42:53 +0000 |
net.server_select: Close all connections when quitting (and not just stepping), matches server_event
|
Matthew Wild |
Sat, 02 Jan 2016 20:42:20 +0000 |
Merge 0.10->trunk
|
Matthew Wild |
Thu, 03 Sep 2015 16:43:46 +0100 |
net.server_{select,event}: addclient: Use getaddrinfo to detect IP address type if no socket type argument given. (Argument must be given for non-TCP)
|
Kim Alvefur |
Mon, 23 Dec 2013 17:57:53 +0100 |
net.server_{select,event}: addclient: Add argument for overriding socket type
|
Kim Alvefur |
Mon, 23 Dec 2013 17:55:41 +0100 |
net/server_select: Fix typo
|
daurnimator |
Wed, 18 Dec 2013 18:06:33 -0500 |
net/server_select: addclient: Check arguments
|
daurnimator |
Wed, 18 Dec 2013 17:55:03 -0500 |
net/server_select: addclient: Check for failure correctly; remove wrapconnection call on failure
|
daurnimator |
Wed, 18 Dec 2013 17:54:31 -0500 |
net/server_select: Check arguments to add_server correctly
|
daurnimator |
Wed, 18 Dec 2013 17:51:27 -0500 |
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 20 Aug 2015 13:05:22 +0200 |
net.server_{select,event}: Don't rely on LuaSocket and LuaSec being present in the globals table
|
Kim Alvefur |
Mon, 23 Feb 2015 12:04:43 +0100 |
net.server_select: Remove unused code
|
daurnimator |
Mon, 19 Jan 2015 14:09:13 -0500 |
net.server_select: Remove socket.sleep call from main loop
|
daurnimator |
Mon, 19 Jan 2015 14:05:37 -0500 |
net.server_select: Remove do-nothing os_difftime calls
|
daurnimator |
Mon, 19 Jan 2015 14:01:11 -0500 |
net.server_select: In add_task timer callback, use passed in time rather than re-fetching
|
daurnimator |
Thu, 15 Jan 2015 09:05:08 -0500 |
net.server_select: Fix timers not being fired until another timer fixes (or 1 second passes)
|
daurnimator |
Thu, 15 Jan 2015 09:03:00 -0500 |
Move timer code out of util.timer and into relevant net.server backends
|
daurnimator |
Mon, 20 Oct 2014 16:13:24 -0400 |
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 05 Oct 2014 15:37:46 +0200 |
net.server_select: Reset read timeout timer if the event is handled
|
Kim Alvefur |
Fri, 03 Oct 2014 14:42:18 +0200 |
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 28 Sep 2014 01:56:22 +0200 |
net.server_select: When an SSL handshake is connected, if there is pending data to be written to the socket, mark the socket as waiting to send (thanks daurnimator)
|
Matthew Wild |
Fri, 26 Sep 2014 17:16:46 +0100 |
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 02 Sep 2014 22:34:32 +0200 |
Merge 0.9->0.10
|
Kim Alvefur |
Tue, 02 Sep 2014 22:33:11 +0200 |
net.server_select: 'listener'->'listeners' (fixes undefined global access)
|
Matthew Wild |
Tue, 02 Sep 2014 17:23:44 +0100 |
net.server_{select,event}: Add 'ondetach' callback for listener objects, to notify them when another listener is being assigned to a connection
|
Matthew Wild |
Fri, 29 Aug 2014 11:39:56 +0100 |
Merge 0.10->trunk
|
Matthew Wild |
Fri, 25 Jul 2014 13:54:47 +0100 |
Merge 0.9->0.10
|
Matthew Wild |
Fri, 25 Jul 2014 13:54:27 +0100 |
net.server_select/event: Switch sender mode to *a when reading, to make sure we get all available data
|
Matthew Wild |
Fri, 25 Jul 2014 13:53:39 +0100 |
net/server_*: Fix addclient: LuaSocket 3.0-rc1 sometimes returns EALREADY instead of EINPROGRESS when the dns lookup has multiple results
|
daurnimator |
Wed, 25 Jun 2014 12:15:00 -0400 |
Merge 0.10->trunk
|
Matthew Wild |
Wed, 02 Apr 2014 17:42:22 +0100 |
Merge 0.9->0.10
|
Matthew Wild |
Wed, 02 Apr 2014 17:41:38 +0100 |
net.server_{select,event}: Add compat code for supporting the same client port API on connections
|
Kim Alvefur |
Tue, 01 Apr 2014 15:26:40 +0200 |
net.server_{select,event}: addclient: Handle missing getaddrinfo
|
Kim Alvefur |
Mon, 23 Dec 2013 23:23:59 +0100 |
net.server_{select,event}: addclient: Use getaddrinfo to detect IP address type if no socket type argument given. (Argument must be given for non-TCP)
|
Kim Alvefur |
Mon, 23 Dec 2013 17:57:53 +0100 |
net.server_{select,event}: addclient: Add argument for overriding socket type
|
Kim Alvefur |
Mon, 23 Dec 2013 17:55:41 +0100 |
net/server_select: Fix typo
|
daurnimator |
Wed, 18 Dec 2013 18:06:33 -0500 |
net/server_select: addclient: Check arguments
|
daurnimator |
Wed, 18 Dec 2013 17:55:03 -0500 |
net/server_select: addclient: Check for failure correctly; remove wrapconnection call on failure
|
daurnimator |
Wed, 18 Dec 2013 17:54:31 -0500 |
net/server_select: Check arguments to add_server correctly
|
daurnimator |
Wed, 18 Dec 2013 17:51:27 -0500 |
net/server_select: pcall require ssl (easy to forget to require ssl)
|
daurnimator |
Wed, 18 Dec 2013 17:50:38 -0500 |
Merge 0.9->0.10
|
Matthew Wild |
Mon, 16 Dec 2013 23:32:11 +0000 |
net.server_select: Don't remove the socket from sendlist when we might have data in the buffer (we'll now let sendbuffer() take care of that) (thanks daurnimator)
|
Matthew Wild |
Mon, 16 Dec 2013 23:31:43 +0000 |
server_select: fix onreadtimeout support so that listeners can override the default (disconnect) behaviour
|
Matthew Wild |
Sat, 28 Sep 2013 18:40:48 +0100 |
net.server_select: Return handler from addclient
|
Kim Alvefur |
Fri, 06 Sep 2013 10:53:04 +0200 |
net.server_select: Pass on all arguments to addclient on to wrapclient
|
Kim Alvefur |
Fri, 06 Sep 2013 10:52:37 +0200 |
Remove all trailing whitespace
|
Florian Zeitz |
Fri, 09 Aug 2013 17:48:21 +0200 |
Merge 0.9->trunk
|
Kim Alvefur |
Sun, 09 Jun 2013 17:03:15 +0200 |
net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks elghinn)
|
Kim Alvefur |
Sun, 09 Jun 2013 17:00:26 +0200 |
Merge 0.9->trunk
|
Matthew Wild |
Wed, 05 Jun 2013 21:36:29 +0100 |
net.server_select: Ensure _maxfd = math.huge on Windows, always.
|
Waqas Hussain |
Sun, 02 Jun 2013 16:23:19 -0400 |
net.server_select: Default checkinterval to 30s, so that read timeouts are actually detected
|
Matthew Wild |
Fri, 24 May 2013 18:33:16 +0100 |
net.server_select: Support for listener.onreadtimeout() [see also e67891ad18d6]
|
Matthew Wild |
Fri, 24 May 2013 18:14:09 +0100 |
net.server_select: Don't limit max file descriptor number on Windows.
|
Waqas Hussain |
Mon, 29 Apr 2013 20:26:48 +0500 |
net.server*: Allow the TCP backlog parameter to be set in the config
|
Kim Alvefur |
Sat, 27 Apr 2013 22:46:01 +0200 |
net.server_select: Don't call onconnect twice for SSL connections
|
Matthew Wild |
Thu, 18 Apr 2013 00:41:03 +0100 |
Merge backout
|
Matthew Wild |
Thu, 18 Apr 2013 00:40:09 +0100 |
Backed out changeset f2631a14b953
|
Matthew Wild |
Thu, 18 Apr 2013 00:39:59 +0100 |
net.server_select: Add and improve some comments.
|
Waqas Hussain |
Tue, 16 Apr 2013 18:18:22 -0400 |
net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer).
|
Waqas Hussain |
Tue, 16 Apr 2013 18:15:10 -0400 |
net.server_select: Normalize indentation
|
Kim Alvefur |
Wed, 17 Apr 2013 21:30:44 +0200 |
net.server_select: Don't call onconnect twice on SSL connections
|
Kim Alvefur |
Wed, 17 Apr 2013 19:10:04 +0200 |
net.server, _select: Reorganise configuration of server_select to be more like server_event
|
Kim Alvefur |
Sat, 23 Mar 2013 20:06:02 +0100 |
net.server_select: Optimization, clean bufferqueue when it makes sense.
|
Kim Alvefur |
Fri, 01 Mar 2013 11:41:26 +0100 |
net.server_select: Use # operator instead of string.len
|
Kim Alvefur |
Fri, 01 Mar 2013 11:11:05 +0100 |
net.server_select: Limit global number of sockets passed to select.
|
Kim Alvefur |
Tue, 12 Feb 2013 03:24:41 +0100 |
net.server_select: Be less aggressive about server pause
|
Kim Alvefur |
Tue, 12 Feb 2013 03:24:30 +0100 |
net.server_select: Remove useless duplicated settimeout() call
|
Kim Alvefur |
Mon, 07 Jan 2013 02:21:03 +0100 |
net.server_select: Fix global access
|
Kim Alvefur |
Mon, 07 Jan 2013 02:20:43 +0100 |
net.server_select: Pause servers while they are full
|
Kim Alvefur |
Fri, 28 Dec 2012 14:33:27 +0100 |
net.server_select: Add pause and resume methods
|
Kim Alvefur |
Fri, 28 Dec 2012 14:33:27 +0100 |
net.server_select: Better names for config options (thanks MattJ)
|
Kim Alvefur |
Fri, 23 Nov 2012 01:51:30 +0100 |
net.server_select: Remove unused variables and imports
|
Matthew Wild |
Sun, 22 Jul 2012 23:41:33 +0100 |
net.server_select: Remove extraneous variable
|
Matthew Wild |
Sun, 22 Jul 2012 23:39:27 +0100 |
net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic.
|
Matthew Wild |
Sun, 22 Jul 2012 22:12:17 +0100 |
net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed)
|
Matthew Wild |
Sun, 22 Jul 2012 16:54:33 +0100 |
net.server_select: Don't close client connections when closing a server (it wasn't working anyway)
|
Matthew Wild |
Wed, 23 May 2012 02:20:32 +0100 |
net.server_select: Call ondisconnect handler, even if we closed the socket ourselves (fixes HTTP session hoarding, thanks Maranda)
|
Matthew Wild |
Wed, 23 May 2012 02:19:11 +0100 |
net.server_select: Return error when SSL handshake fails immediately (thanks Zash)
|
Matthew Wild |
Fri, 18 May 2012 00:27:06 +0100 |
net.server, net.timer, net.server_select: Rearrange dependencies between these three modules. server.addtimer() is no longer a public function (renamed to _addtimer) and is not available at all from server_event (compat code removed to prevent traceback) (thanks Nulani)
|
Matthew Wild |
Thu, 03 May 2012 16:48:34 +0100 |
net.server_select: Remove server from _server table when closing
|
Matthew Wild |
Tue, 24 Apr 2012 15:42:35 +0100 |
net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda)
|
Matthew Wild |
Mon, 28 Nov 2011 03:04:50 +0000 |
net.server_event, net.server_select: Fixed some global pollution.
|
Waqas Hussain |
Fri, 14 Oct 2011 00:46:29 +0500 |
net.server_select: Minor whitespace fix.
|
Waqas Hussain |
Thu, 13 Oct 2011 00:11:17 +0500 |
net.server_select: Never call onincoming with nil data when a listener doesn't have an onconnect handler
|
Matthew Wild |
Tue, 27 Sep 2011 17:28:56 +0100 |
net.server_select: Remove socket from sendlist before calling listener callbacks (thanks darkrain)
|
Matthew Wild |
Sat, 20 Aug 2011 16:14:07 -0400 |
net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL
|
Matthew Wild |
Sat, 20 Aug 2011 15:06:14 -0400 |
net.server_select: Update error logging logic during SSL handshake (now shows correctly when a handshake exceeded max. allowed iterations)
|
Matthew Wild |
Sat, 20 Aug 2011 15:04:17 -0400 |
net.server_select: Small fix to SSL handshake logic, read/wrote were being checked despite it not being possible for them to be other than nil
|
Matthew Wild |
Sat, 20 Aug 2011 15:03:16 -0400 |
net.server_select: Do not set 'ssl' flag simply when assigning an sslctx to a handler, it doesn't mean anything
|
Matthew Wild |
Sat, 20 Aug 2011 14:59:31 -0400 |
connlistener, server_select, prosody: Add support for binding to multiple addresses
|
Florian Zeitz |
Wed, 15 Jun 2011 23:44:18 +0200 |
net.server_select: Expose step() function (thanks Łukasz)
|
Matthew Wild |
Mon, 14 Feb 2011 19:12:16 +0000 |
net.server_select, net.server_event: Silence 'error during ssl handshake' for wantread and wantwrite
|
Matthew Wild |
Tue, 11 Jan 2011 05:04:08 +0000 |
net/server_select.lua: Reduce select() timeout back to 1s
|
Matthew Wild |
Sat, 18 Dec 2010 14:46:28 +0000 |
net.server_select: Set select() timeout to 3600 by default.
|
Waqas Hussain |
Thu, 02 Dec 2010 23:07:45 +0500 |
net.server_select: Made another global local.
|
Waqas Hussain |
Thu, 02 Dec 2010 23:06:30 +0500 |
net.server_select: Made some globals local.
|
Waqas Hussain |
Thu, 02 Dec 2010 22:55:42 +0500 |
net.server_select: Make changes required for sub-second timer precision.
|
Waqas Hussain |
Thu, 02 Dec 2010 22:40:42 +0500 |
net.server_select: Restore real sendbuffer() before calling onconnect handler, in case onconnect sends data and the socket is still writeable (causing stack overflow into sendbuffer()/onconnect())
|
Matthew Wild |
Fri, 22 Oct 2010 06:33:30 +0100 |
net.server_select: Add server.step() to run through a single iteration of the event loop
|
Matthew Wild |
Thu, 09 Sep 2010 20:10:28 +0100 |
net.server_select, net.server_event: Remove set_mode() call from server.link()... it can cause the last chunk of data to be discarded if shorter than buffersize (thanks to Zash for the debugging)
|
Matthew Wild |
Sun, 22 Aug 2010 21:12:22 +0100 |
net.server_select: Remove 'now' parameter from starttls(), and base it on whether the sendbuffer is empty instead
|
Matthew Wild |
Thu, 22 Jul 2010 13:19:37 +0100 |
net.server_select: Ensure that onconnect is called for server sockets as well as clients, rather than onincoming. Fixes mod_console traceback, issue #197
|
Matthew Wild |
Fri, 16 Jul 2010 22:28:50 +0100 |
Merge 0.7->trunk
|
Matthew Wild |
Fri, 02 Jul 2010 17:44:14 +0100 |
net.server_select: Clean up buffer and fire drained callback on successful write before we try and start TLS negotiation (if negotiation fails instantly then we can be left without a handler to use for cleanup) (thanks dersd)
|
Matthew Wild |
Fri, 02 Jul 2010 17:24:40 +0100 |
net.server_select: Fix a snippet of code that was living at the wrong indentation level
|
Matthew Wild |
Fri, 02 Jul 2010 17:23:17 +0100 |
net.server_select: Remove some debugging code.
|
Waqas Hussain |
Thu, 06 May 2010 23:16:50 +0500 |
Merge 0.7->trunk
|
Matthew Wild |
Wed, 05 May 2010 17:22:43 +0100 |
net.server_select: Fix typo affecting connections with an onconnect listener that have data pending in the sendbuffer
|
Matthew Wild |
Wed, 05 May 2010 17:12:32 +0100 |
Merge 0.7->trunk
|
Matthew Wild |
Wed, 05 May 2010 15:33:58 +0100 |
net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size
|
Matthew Wild |
Wed, 05 May 2010 15:25:48 +0100 |
net.server_select, net.server_event: Support for ondrain listener callback for when send buffer is empty
|
Matthew Wild |
Wed, 05 May 2010 15:24:24 +0100 |
net.server_select, net.server_event: Rename :pattern() method to :set_mode() for select backend, and add :set_mode() to event backend
|
Matthew Wild |
Wed, 05 May 2010 15:23:17 +0100 |
net.server_select, net.server_event: Support for :pause() and :resume() on connections
|
Matthew Wild |
Wed, 05 May 2010 15:21:17 +0100 |
Merge Tobias's fancy SASL branch->trunk
|
Matthew Wild |
Wed, 05 May 2010 11:29:10 +0100 |
Merge with tip.
|
Tobias Markmann |
Fri, 12 Mar 2010 18:41:05 +0100 |
util.sasl: 2009 -> 2010 in copyright header.
|
Tobias Markmann |
Fri, 12 Mar 2010 18:37:51 +0100 |
net.server_select: Support for listener.onconnect
|
Matthew Wild |
Sun, 11 Apr 2010 01:11:42 +0100 |
Merge 0.6->0.7
base
net/server.lua@9aac5922d2ce
|
Matthew Wild |
Fri, 09 Apr 2010 12:31:51 +0100 |
Merge 0.6->0.7
base
net/server.lua@fc8a03e520c7
|
Matthew Wild |
Mon, 22 Mar 2010 17:24:55 +0000 |
net.server_select: Fix for traceback when a read returns an error and no data (thanks dersd)
|
Matthew Wild |
Fri, 05 Mar 2010 16:45:46 +0000 |
net.server_select: Fix typo
|
Matthew Wild |
Mon, 01 Mar 2010 18:47:03 +0000 |
net.server_select: Fix calling method of some handler.close()s
|
Matthew Wild |
Mon, 01 Mar 2010 18:06:54 +0000 |
net.server_select: Small indentation fix
|
Matthew Wild |
Thu, 11 Feb 2010 21:13:45 +0000 |
net.server_select: Fix traceback with no LuaSec available (thanks Nolan)
|
Matthew Wild |
Thu, 11 Feb 2010 21:09:59 +0000 |
net.server_select: Only allow starttls if luasec is available (thanks Nolan)
|
Matthew Wild |
Wed, 10 Feb 2010 19:17:45 +0000 |
net.server_select: *Major* whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs
|
Matthew Wild |
Wed, 10 Feb 2010 19:12:43 +0000 |
net.server_select: listener.status -> listener.onstatus for consistency
|
Matthew Wild |
Sun, 31 Jan 2010 19:56:22 +0000 |
net.server_select: Report whether a new listener uses SSL or not in the log message
|
Matthew Wild |
Sun, 31 Jan 2010 16:23:38 +0000 |
net.server_select: Remove startssl parameter to the client/server creation functions - passing a sslctx now indicates you want to use SSL from the start
|
Matthew Wild |
Sun, 31 Jan 2010 15:37:08 +0000 |
net.server_{select,event}: Fail gracefully if socket doesn't have a setoption method (LuaSec issue I think)
|
Matthew Wild |
Thu, 21 Jan 2010 12:56:08 +0000 |
net.server_select: Add conn:setoption() to set options on the socket
|
Matthew Wild |
Tue, 12 Jan 2010 15:15:49 +0000 |
net.server_select: Fix oops in last commit
|
Matthew Wild |
Wed, 06 Jan 2010 16:20:56 +0000 |
net.server_select: Allow setting the logger using server.setlogger
|
Matthew Wild |
Wed, 06 Jan 2010 16:16:23 +0000 |
net.server_select: Add get_backend() method
|
Matthew Wild |
Tue, 08 Dec 2009 01:22:09 +0000 |
net.server_select, net.server_event: Convert to unix line endings from Windows
|
Matthew Wild |
Fri, 04 Dec 2009 03:07:17 +0000 |
net.server_select: Restore checks for wantread/timeout errors on receive
|
Matthew Wild |
Thu, 03 Dec 2009 19:18:18 +0000 |
net.server_select: Add a function to just lock a stream for reading
|
Sjoerd Simons |
Thu, 03 Dec 2009 16:53:58 +0100 |
net.server_select: Make bufferlen() method return, of all things, the buffer length
|
Matthew Wild |
Thu, 03 Dec 2009 14:08:54 +0000 |
net.server_select: Fix possibility of losing data sent from a socket just before it closes (thanks Sjoerd Simons)
|
Matthew Wild |
Thu, 03 Dec 2009 02:28:34 +0000 |
net.server_select: Update conn.close() to use new connection method convention
|
Matthew Wild |
Sat, 28 Nov 2009 14:09:53 +0000 |
net.server_select: Rename server.setsend() to server.set_send() for consistency
|
Matthew Wild |
Thu, 26 Nov 2009 22:08:47 +0000 |
net.server_select: Bring up to date to new common connection API
|
Matthew Wild |
Sun, 22 Nov 2009 04:45:13 +0000 |
net.server_select: Change addserver() parameters to be compatible with new standard syntax
|
Matthew Wild |
Sat, 21 Nov 2009 17:19:57 +0000 |
net.server: Rename to net.server_select
base
net/server.lua@5451ab3dc03c
|
Matthew Wild |
Sat, 21 Nov 2009 02:36:35 +0000 |