aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2016-04-061-1/+0
|\
| * server_event: addclient: wrapclient already calls startconnection for us ↵daurnimator2013-12-181-2/+1
| | | | | | | | [backported from trunk]
* | Merge 0.10->trunkKim Alvefur2016-04-051-17/+22
|\|
| * server_event: Split long list of assignments into multiple lines for readabilityKim Alvefur2016-04-051-4/+7
| |
| * server_event: Fix indentation (again)Kim Alvefur2016-04-051-526/+527
| |
* | Merge 0.10->trunkKim Alvefur2016-03-291-2/+2
|\|
| * net.server_select: Remove do-nothing os_difftime calls [backported from trunk]daurnimator2015-01-191-5/+3
| |
| * net.dns: Import unpack() in forward-compatible way (Fixes compat with Lua5.2+)Kim Alvefur2016-03-281-2/+2
| |
* | Merge 0.10->trunkMatthew Wild2016-03-101-1/+0
|\|
| * net.websocket.frames, util.datetime, util.json, util.prosodyctl, ↵Matthew Wild2016-03-101-1/+0
| | | | | | | | util.rfc6724: Remove unused variables [luacheck]
* | Merge 0.10->trunkKim Alvefur2016-03-021-7/+8
|\|
| * Merge 0.9->0.10Kim Alvefur2016-03-021-525/+526
| |\
| | * net.server_event: Return true from conn:resume() to indicate successKim Alvefur2016-03-021-0/+1
| | |
| | * net.server_event: Prevent resuming connections without readcallback, eg ↵Kim Alvefur2016-03-021-1/+1
| | | | | | | | | | | | closed connections (fixes #590)
* | | Merge 0.10->trunkKim Alvefur2016-01-223-30/+50
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-01-223-8/+28
| |\|
| | * server_select: Add logging of when servers are paused and resumedKim Alvefur2016-01-221-0/+2
| | |
| | * server_select: Pause and mark server as full if accepting a client fails ↵Kim Alvefur2016-01-221-0/+2
| | | | | | | | | | | | (fixes #597)
| | * server_select: Retry accepting clients from full servers after 10s (matches ↵Kim Alvefur2016-01-222-1/+12
| | | | | | | | | | | | libevent behaviour)
| | * server_select: Keep track of which server listeners are fullKim Alvefur2016-01-221-0/+5
| | |
| | * net.dns: Remember query only after it was sent, in case it was not (fixes #598)Kim Alvefur2016-01-211-5/+5
| | |
* | | Merge 0.10->trunkKim Alvefur2016-01-161-1/+1
|\| |
| * | net.http.server: Return from listen_on() whatever net.server.addserver() returnsKim Alvefur2016-01-161-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-01-101-0/+3
|\| |
| * | net.server_select: Add 'server' method to client connections (present in ↵Kim Alvefur2016-01-091-0/+3
| | | | | | | | | | | | server_event)
* | | Merge 0.10->trunkKim Alvefur2016-01-081-2/+4
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-01-081-2/+4
| |\|
| | * Backout 88d54bec26b7 prior to release, as it certainly requires more testing0.9.9Matthew Wild2016-01-081-1/+3
| | |
| | * net.dns: Allow a zone id in resolv.conf (eg like %eth0)Kim Alvefur2016-01-041-1/+1
| | |
| | * net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10]Florian Zeitz2013-06-181-6/+13
| | |
* | | Merge 0.10->trunkMatthew Wild2016-01-041-2/+3
|\| |
| * | server_select: Forward the actual TLS handshake error messageKim Alvefur2016-01-031-2/+3
| | |
* | | Merge 0.10->trunkMatthew Wild2016-01-022-0/+2
|\| |
| * | net.server_select: Close all connections when quitting (and not just ↵Matthew Wild2016-01-021-0/+1
| | | | | | | | | | | | stepping), matches server_event
| * | net.server_event: Add conn.type == 'server' for server sockets (fixes ↵Matthew Wild2016-01-021-0/+1
| | | | | | | | | | | | closeallservers() )
* | | Merge 0.10->trunkMatthew Wild2015-12-031-0/+1
|\| |
| * | net.http.server: Import util.cacheMatthew Wild2015-12-031-0/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2015-12-031-5/+5
|\| |
| * | net.http.server: Use new util.cache to remember wildcard event handlersMatthew Wild2015-12-031-5/+5
| | |
* | | net.server_event: Return event handle from add_task so it can be closed by ↵Kim Alvefur2015-11-221-0/+1
| | | | | | | | | | | | eg util.timer
* | | Merge 0.10->trunkKim Alvefur2015-10-111-7/+32
|\| |
| * | net.websocket.frames: Fix syntax error due to code copy pastingKim Alvefur2015-10-061-2/+2
| | |
| * | net.websocket.frames: Use struct packing in Lua 5.3 or struct lib if availableKim Alvefur2015-10-061-0/+25
| | |
| * | net.websocket.frames: Pack and unpack 64bit ints without overflows ↵Kim Alvefur2015-10-061-4/+6
| | | | | | | | | | | | (lua-bitop/bit32 are 32bit)
| * | net.websocket.frames: Link to documentation when bitop is missingKim Alvefur2015-10-061-1/+1
| | |
| * | net.websocket.frames: Throw an error if no bit lib is foundKim Alvefur2015-10-061-2/+2
| | |
| * | net.websocket.frames: Simplify import of bitlibKim Alvefur2015-10-061-3/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2015-09-251-3/+1
|\| |
| * | MergeKim Alvefur2015-09-251-3/+1
| |\ \
| | * | Merge 0.9->0.10Matthew Wild2015-09-251-3/+1
| | |\|