Commit graph

92 commits

Author SHA1 Message Date
Florian Zeitz
1d833bb807 Remove all trailing whitespace 2013-08-09 17:48:21 +02:00
Kim Alvefur
0086d5819d Merge 0.9->trunk 2013-06-09 17:03:15 +02:00
Kim Alvefur
4675a091eb net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks elghinn) 2013-06-09 17:00:26 +02:00
Matthew Wild
a4eb37148c Merge 0.9->trunk 2013-06-05 21:36:29 +01:00
Waqas Hussain
216ded22c8 net.server_select: Ensure _maxfd = math.huge on Windows, always. 2013-06-02 16:23:19 -04:00
Matthew Wild
8c7ccc0368 net.server_select: Default checkinterval to 30s, so that read timeouts are actually detected 2013-05-24 18:33:16 +01:00
Matthew Wild
b5eff9a901 net.server_select: Support for listener.onreadtimeout() [see also e67891ad18d6] 2013-05-24 18:14:09 +01:00
Waqas Hussain
e7ac57cac6 net.server_select: Don't limit max file descriptor number on Windows. 2013-04-29 20:26:48 +05:00
Kim Alvefur
a7340fef1c net.server*: Allow the TCP backlog parameter to be set in the config 2013-04-27 22:46:01 +02:00
Matthew Wild
1da2e8a43e net.server_select: Don't call onconnect twice for SSL connections 2013-04-18 00:41:03 +01:00
Matthew Wild
c619e0e817 Merge backout 2013-04-18 00:40:09 +01:00
Matthew Wild
e6c2af23eb Backed out changeset f2631a14b953 2013-04-18 00:39:59 +01:00
Kim Alvefur
012519b6ad net.server_select: Don't call onconnect twice on SSL connections 2013-04-17 19:10:04 +02:00
Waqas Hussain
fa54448b7a net.server_select: Add and improve some comments. 2013-04-16 18:18:22 -04:00
Waqas Hussain
107fcdf36a 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). 2013-04-16 18:15:10 -04:00
Kim Alvefur
de11909b74 net.server_select: Normalize indentation 2013-04-17 21:30:44 +02:00
Kim Alvefur
39acad1765 net.server, _select: Reorganise configuration of server_select to be more like server_event 2013-03-23 20:06:02 +01:00
Kim Alvefur
c1ca70e310 net.server_select: Optimization, clean bufferqueue when it makes sense. 2013-03-01 11:41:26 +01:00
Kim Alvefur
35a4031ce4 net.server_select: Use # operator instead of string.len 2013-03-01 11:11:05 +01:00
Kim Alvefur
4e9061b326 net.server_select: Limit global number of sockets passed to select. 2013-02-12 03:24:41 +01:00
Kim Alvefur
380d2bd865 net.server_select: Be less aggressive about server pause 2013-02-12 03:24:30 +01:00
Kim Alvefur
bea132059b net.server_select: Remove useless duplicated settimeout() call 2013-01-07 02:21:03 +01:00
Kim Alvefur
65a2b43b0d net.server_select: Fix global access 2013-01-07 02:20:43 +01:00
Kim Alvefur
de47f7e836 net.server_select: Pause servers while they are full 2012-12-28 14:33:27 +01:00
Kim Alvefur
f2af550531 net.server_select: Add pause and resume methods 2012-12-28 14:33:27 +01:00
Kim Alvefur
c3fe715df7 net.server_select: Better names for config options (thanks MattJ) 2012-11-23 01:51:30 +01:00
Matthew Wild
189de127dc net.server_select: Remove unused variables and imports 2012-07-22 23:41:33 +01:00
Matthew Wild
a60f6500ea net.server_select: Remove extraneous variable 2012-07-22 23:39:27 +01:00
Matthew Wild
689b6f19a0 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. 2012-07-22 22:12:17 +01:00
Matthew Wild
73c5470e83 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) 2012-07-22 16:54:33 +01:00
Matthew Wild
be0728553e net.server_select: Don't close client connections when closing a server (it wasn't working anyway) 2012-05-23 02:20:32 +01:00
Matthew Wild
5d6f4c7124 net.server_select: Call ondisconnect handler, even if we closed the socket ourselves (fixes HTTP session hoarding, thanks Maranda) 2012-05-23 02:19:11 +01:00
Matthew Wild
007ebd8a18 net.server_select: Return error when SSL handshake fails immediately (thanks Zash) 2012-05-18 00:27:06 +01:00
Matthew Wild
ffa939698b 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) 2012-05-03 16:48:34 +01:00
Matthew Wild
f56e371309 net.server_select: Remove server from _server table when closing 2012-04-24 15:42:35 +01:00
Matthew Wild
6975f1a07d net.server_select: Autostart SSL negotiation as the last part of socket setup to avoid a traceback (#262) (thanks Maranda) 2011-11-28 03:04:50 +00:00
Waqas Hussain
a516177631 net.server_event, net.server_select: Fixed some global pollution. 2011-10-14 00:46:29 +05:00
Waqas Hussain
11c4ae1a2b net.server_select: Minor whitespace fix. 2011-10-13 00:11:17 +05:00
Matthew Wild
b07e6ff42e net.server_select: Never call onincoming with nil data when a listener doesn't have an onconnect handler 2011-09-27 17:28:56 +01:00
Matthew Wild
868d6804c6 net.server_select: Remove socket from sendlist before calling listener callbacks (thanks darkrain) 2011-08-20 16:14:07 -04:00
Matthew Wild
80c0a2c470 net.server_select: Merge straight-SSL and starttls code paths, also fixes onconnect being called before handshake completion for straight-SSL 2011-08-20 15:06:14 -04:00
Matthew Wild
b43b86615b net.server_select: Update error logging logic during SSL handshake (now shows correctly when a handshake exceeded max. allowed iterations) 2011-08-20 15:04:17 -04:00
Matthew Wild
7915c70e13 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 2011-08-20 15:03:16 -04:00
Matthew Wild
2757058cd2 net.server_select: Do not set 'ssl' flag simply when assigning an sslctx to a handler, it doesn't mean anything 2011-08-20 14:59:31 -04:00
Florian Zeitz
6d5ef2f7f9 connlistener, server_select, prosody: Add support for binding to multiple addresses 2011-06-15 23:44:18 +02:00
Matthew Wild
231d285f0e net.server_select: Expose step() function (thanks Łukasz) 2011-02-14 19:12:16 +00:00
Matthew Wild
72dc9416ef net.server_select, net.server_event: Silence 'error during ssl handshake' for wantread and wantwrite 2011-01-11 05:04:08 +00:00
Matthew Wild
acbe5b3dff net/server_select.lua: Reduce select() timeout back to 1s 2010-12-18 14:46:28 +00:00
Waqas Hussain
5400d9c376 net.server_select: Set select() timeout to 3600 by default. 2010-12-02 23:07:45 +05:00
Waqas Hussain
8d6882c857 net.server_select: Made another global local. 2010-12-02 23:06:30 +05:00