aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10 -> trunkMatthew Wild2016-07-281-2/+2
|\
| * net.dns: remove unused variable unpack [luacheck]Anton Shestakov2016-07-281-2/+2
| |
| * net.server_select: remove unused import [luacheck]Anton Shestakov2016-07-281-1/+0
| |
* | Merge 0.10 -> trunkMatthew Wild2016-07-271-3/+3
|\|
| * net.http: Add quotes around ids in log messagesMatthew Wild2016-07-271-3/+3
| |
* | Merge 0.10->trunkKim Alvefur2016-07-142-5/+5
|\|
| * net.server_select: remove unused one-letter loop variable [luacheck]Anton Shestakov2016-07-141-1/+1
| |
| * net.dns: remove unused one-letter loop variables [luacheck]Anton Shestakov2016-07-141-4/+4
| |
* | Merge 0.10->trunkKim Alvefur2016-07-132-2/+44
|\|
| * net.http.server: Add response method for reading response body from a file ↵Kim Alvefur2016-07-111-0/+42
| | | | | | | | handle
| * net.dns: don't use "for s,s in pairs..." (unused loop variable s) [luacheck]Anton Shestakov2016-07-091-2/+2
| |
* | Merge 0.10->trunkKim Alvefur2016-07-083-7/+6
|\|
| * net.adns: remove unused local variables t_insert and t_remove [luacheck]Anton Shestakov2016-07-091-1/+0
| |
| * net.dns: remove unused one-letter loop variables [luacheck]Anton Shestakov2016-07-091-4/+4
| |
| * net.server_select: remove unused one-letter loop variables [luacheck]Anton Shestakov2016-07-091-2/+2
| |
* | Merge 0.10->trunkMatthew Wild2016-07-071-1/+17
|\|
| * net.http: Add log messages for requests, including their id (so "calling ↵Matthew Wild2016-07-071-1/+13
| | | | | | | | callback" and tracebacks can be traced back to their initial request)
| * net.http: Add request.id to every request object (can be overridden by ↵Matthew Wild2016-07-071-0/+4
| | | | | | | | providing ex.id)
* | Merge 0.10->trunkKim Alvefur2016-05-041-5/+6
|\|
| * net.server_event: Schedule another read callback if there is still data left ↵Kim Alvefur2016-05-041-1/+5
| | | | | | | | in buffer after reading (fixes #583 for real)
| * net.server_event: Collect entire one line function on one lineKim Alvefur2016-05-041-4/+1
| |
* | Merge 0.10->trunkKim Alvefur2016-04-191-1/+1
|\|
| * Merge 0.9->0.10Kim Alvefur2016-04-191-1/+1
| |\
| | * net.server_event: Check the buffer *length*, not the buffer itself (Fixes ↵Kim Alvefur2016-04-191-1/+1
| | | | | | | | | | | | 100% cpu usage introduced in 65abd9d7bf88)
* | | Merge 0.10->trunkKim Alvefur2016-04-191-4/+3
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-04-191-4/+3
| |\|
| | * net.server_event: Return the correct value as timeoutKim Alvefur2016-04-191-1/+1
| | |
| | * net.server_event: Fix traceback if event re-added during starttlsKim Alvefur2016-04-191-4/+3
| | |
* | | Merge 0.10->trunkKim Alvefur2016-04-191-0/+4
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-04-191-0/+4
| |\|
| | * net.server_event: Re-add write event if writebuffer is non-empty after write ↵Kim Alvefur2016-04-191-0/+4
| | | | | | | | | | | | (eg due to writes from ondrain callback) (fixes #661)
* | | Update every link to the documentation to use HTTPSEmmanuel Gil Peyrot2016-04-162-2/+2
| | |
* | | 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)