aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.9->trunkMatthew Wild2013-06-111-0/+2
|\
| * certmanager: Use 'curve' and 'dhparam' options from ssl config if presentMatthew Wild2013-06-111-0/+2
| * mod_admin_telnet: Add server:memory() command to view details of Prosody's me...Matthew Wild2013-05-161-0/+21
| * mod_bosh: Remove Connection: keep-alive header (conflicts with new net.http.s...Matthew Wild2013-06-071-1/+1
| * mod_bosh: Fix global writeMatthew Wild2013-06-071-1/+2
* | mod_c2s, mod_s2s: Fire an event on read timeoutsKim Alvefur2013-06-112-3/+16
* | mod_c2s: Become a shared module and allow being disabled on some virtualhostsKim Alvefur2013-06-111-1/+3
* | mod_bosh: Reduce a little code.Waqas Hussain2013-06-111-6/+2
* | Merge 0.9->trunkKim Alvefur2013-06-101-1/+1
|\|
| * mod_admin_telnet: Fix another wrong boolean expressionKim Alvefur2013-06-101-1/+1
* | Merge 0.9->trunkKim Alvefur2013-06-091-1/+3
|\|
| * net.server_select: Make sure there is a server to pause when hitting maxfd (T...Kim Alvefur2013-06-091-1/+3
* | mod_admin_telnet: Simplify IPv6 detection, fixes rare tracebackKim Alvefur2013-06-091-1/+1
* | mod_s2s: Set s2s_session.ipKim Alvefur2013-06-091-0/+1
* | mod_bosh: Make waiting_requests and dead_sessions shared to preserve across r...Matthew Wild2013-06-081-2/+2
* | mod_muc: Include status code 332 on service shutdown (thanks mathieui)Matthew Wild2013-06-081-1/+2
* | mod_bosh: Don't tostring() stream:features when passing to session.send().Waqas Hussain2013-06-071-1/+1
* | prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificatesKim Alvefur2013-06-071-0/+75
* | certmanager: Complain if key or certificate is missing from SSL config.Kim Alvefur2013-06-071-0/+2
* | prosodyctl: Add 'prosodyctl check --help'Kim Alvefur2013-06-071-0/+4
* | mod_bosh: Only return CORS headers if the Origin header is received, and CORS...Waqas Hussain2013-06-071-2/+4
* | mod_bosh: Return empty string from the OPTIONS event handler, don't return th...Waqas Hussain2013-06-071-1/+2
* | mod_bosh: Rename event handler argument to event, not request.Waqas Hussain2013-06-071-2/+2
* | Merge 0.9->trunkMatthew Wild2013-06-071-1/+1
|\|
| * mod_bosh: Remove logging of request.id, it doesn't exist in the new HTTP serv...Matthew Wild2013-06-071-1/+1
* | mod_bosh: Remove another place we set headers, fixes #348Matthew Wild2013-06-061-1/+0
* | mod_bosh: Clean up handling of response headers, set them only in one placeMatthew Wild2013-06-051-23/+23
* | mod_bosh: Return errors when appropriate (invalid XML, missing sid)Matthew Wild2013-06-051-1/+6
* | mod_bosh: Remove some very verbose loggingMatthew Wild2013-06-051-3/+0
* | Merge 0.9->trunkMatthew Wild2013-06-053-2/+3
|\|
| * mod_bosh: Reset creating_session to prevent putting unnecessary attributes in...Matthew Wild2013-06-051-0/+1
| * mod_admin_telnet: Fix inverted boolean logicKim Alvefur2013-06-041-1/+1
| * net.server_select: Ensure _maxfd = math.huge on Windows, always.Waqas Hussain2013-06-021-1/+1
* | configure: Fix poor layoutJames Callahan2013-06-031-27/+26
* | Merge 0.9->trunkKim Alvefur2013-06-021-1/+1
|\|
| * mod_bosh: Fix traceback in case session is destroyed during the stream-featur...Kim Alvefur2013-06-021-1/+1
* | mod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into detecti...Kim Alvefur2013-05-302-0/+14
* | mod_register: get_child_text()!Kim Alvefur2013-05-281-2/+2
* | mod_s2s: Remove unnecessary debug messageMatthew Wild2013-05-281-1/+0
* | mod_bosh: rename variable for clarityMatthew Wild2013-05-241-2/+2
* | mod_bosh: Some very minor whitespace/layout fixesMatthew Wild2013-05-241-3/+4
* | net.server_select: Default checkinterval to 30s, so that read timeouts are ac...Matthew Wild2013-05-241-1/+1
* | net.server_select: Support for listener.onreadtimeout() [see also e67891ad18d6]Matthew Wild2013-05-241-4/+4
* | Merge 0.9->trunkKim Alvefur2013-05-261-0/+2
|\|
| * mod_admin_telnet: Make the muc:create() command complain if the room already ...Kim Alvefur2013-05-261-0/+2
* | Merge 0.9->trunkKim Alvefur2013-05-261-1/+1
|\|
| * util.pubsub: Fix get_subscriptions to not pass a boolean as node name (thanks...Kim Alvefur2013-05-261-1/+1
* | mod_disco: Emit events for disco requests, which contain a node, on user acco...Florian Zeitz2013-05-172-10/+32
* | mod_pubsub: Split out handlers into a module libraryFlorian Zeitz2013-05-172-235/+248
* | net.server_event: Add support for listener.onreadtimeout(conn), which can ret...Matthew Wild2013-05-241-49/+52