| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge the merge | Matthew Wild | 2013-06-13 | 9 | -223/+296 |
|\ |
|
| * | mod_muc: Add Ad-Hoc command to destroy MUC rooms | Florian Zeitz | 2013-06-05 | 1 | -0/+36 |
| * | mod_muc: Utilize mod_disco, instead of reimplementing disco handling | Florian Zeitz | 2013-06-05 | 1 | -14/+9 |
| * | mod_pubsub: Utilize mod_disco, instead of reimplementing disco handling | Florian Zeitz | 2013-06-05 | 1 | -130/+108 |
| * | mod_disco: Allow ansering disco requests including nodes, and adding custom i... | Florian Zeitz | 2013-06-04 | 1 | -8/+35 |
| * | mod_http_files: Put the MIME type map in a global shared table | Kim Alvefur | 2013-06-13 | 1 | -1/+1 |
| * | util.sasl.external: Add SASL EXTERNAL mechanism | Kim Alvefur | 2013-06-13 | 2 | -0/+26 |
| * | prosody: Remove global ssl context, no longer used | Kim Alvefur | 2013-06-13 | 1 | -6/+0 |
| * | mod_tls: Refactor to allow separate SSL configuration for c2s and s2s connect... | Kim Alvefur | 2013-06-13 | 1 | -26/+36 |
| * | certmanager: Overhaul of how ssl configs are built. | Kim Alvefur | 2013-06-13 | 1 | -38/+45 |
* | | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 1 | -1/+5 |
|\ \
| |/
|/| |
|
| * | util.dataforms: Return nil for empty list-mutli responses, to be consistent w... | Florian Zeitz | 2013-06-14 | 1 | -1/+5 |
* | | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 1 | -2/+3 |
|\| |
|
| * | mod_pep: When a client supplies no id on a published item, reflect our genera... | Florian Zeitz | 2013-06-13 | 1 | -2/+3 |
* | | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 0 | -0/+0 |
|\| |
|
| * | mod_muc: Fix incorrect variable name | Matthew Wild | 2013-05-21 | 1 | -1/+1 |
* | | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 1 | -0/+5 |
|\| |
|
| * | certmanager: Add single_dh_use and single_ecdh_use to default options | Matthew Wild | 2013-06-13 | 1 | -0/+5 |
* | | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 2 | -1/+4 |
|\| |
|
| * | certmanager: Set ssl.curve to 'secp384r1' by default, to enable ECC ciphers | Matthew Wild | 2013-06-13 | 1 | -1/+1 |
| * | util.pubsub: Check whether node exists, when deleting | Florian Zeitz | 2013-06-12 | 1 | -0/+3 |
* | | Merge 0.9->trunk | Matthew Wild | 2013-06-11 | 1 | -0/+2 |
|\| |
|
| * | certmanager: Use 'curve' and 'dhparam' options from ssl config if present | Matthew Wild | 2013-06-11 | 1 | -0/+2 |
| * | mod_admin_telnet: Add server:memory() command to view details of Prosody's me... | Matthew Wild | 2013-05-16 | 1 | -0/+21 |
| * | mod_bosh: Remove Connection: keep-alive header (conflicts with new net.http.s... | Matthew Wild | 2013-06-07 | 1 | -1/+1 |
| * | mod_bosh: Fix global write | Matthew Wild | 2013-06-07 | 1 | -1/+2 |
* | | mod_c2s, mod_s2s: Fire an event on read timeouts | Kim Alvefur | 2013-06-11 | 2 | -3/+16 |
* | | mod_c2s: Become a shared module and allow being disabled on some virtualhosts | Kim Alvefur | 2013-06-11 | 1 | -1/+3 |
* | | mod_bosh: Reduce a little code. | Waqas Hussain | 2013-06-11 | 1 | -6/+2 |
* | | Merge 0.9->trunk | Kim Alvefur | 2013-06-10 | 1 | -1/+1 |
|\| |
|
| * | mod_admin_telnet: Fix another wrong boolean expression | Kim Alvefur | 2013-06-10 | 1 | -1/+1 |
* | | Merge 0.9->trunk | Kim Alvefur | 2013-06-09 | 1 | -1/+3 |
|\| |
|
| * | net.server_select: Make sure there is a server to pause when hitting maxfd (T... | Kim Alvefur | 2013-06-09 | 1 | -1/+3 |
* | | mod_admin_telnet: Simplify IPv6 detection, fixes rare traceback | Kim Alvefur | 2013-06-09 | 1 | -1/+1 |
* | | mod_s2s: Set s2s_session.ip | Kim Alvefur | 2013-06-09 | 1 | -0/+1 |
* | | mod_bosh: Make waiting_requests and dead_sessions shared to preserve across r... | Matthew Wild | 2013-06-08 | 1 | -2/+2 |
* | | mod_muc: Include status code 332 on service shutdown (thanks mathieui) | Matthew Wild | 2013-06-08 | 1 | -1/+2 |
* | | mod_bosh: Don't tostring() stream:features when passing to session.send(). | Waqas Hussain | 2013-06-07 | 1 | -1/+1 |
* | | prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates | Kim Alvefur | 2013-06-07 | 1 | -0/+75 |
* | | certmanager: Complain if key or certificate is missing from SSL config. | Kim Alvefur | 2013-06-07 | 1 | -0/+2 |
* | | prosodyctl: Add 'prosodyctl check --help' | Kim Alvefur | 2013-06-07 | 1 | -0/+4 |
* | | mod_bosh: Only return CORS headers if the Origin header is received, and CORS... | Waqas Hussain | 2013-06-07 | 1 | -2/+4 |
* | | mod_bosh: Return empty string from the OPTIONS event handler, don't return th... | Waqas Hussain | 2013-06-07 | 1 | -1/+2 |
* | | mod_bosh: Rename event handler argument to event, not request. | Waqas Hussain | 2013-06-07 | 1 | -2/+2 |
* | | Merge 0.9->trunk | Matthew Wild | 2013-06-07 | 1 | -1/+1 |
|\| |
|
| * | mod_bosh: Remove logging of request.id, it doesn't exist in the new HTTP serv... | Matthew Wild | 2013-06-07 | 1 | -1/+1 |
* | | mod_bosh: Remove another place we set headers, fixes #348 | Matthew Wild | 2013-06-06 | 1 | -1/+0 |
* | | mod_bosh: Clean up handling of response headers, set them only in one place | Matthew Wild | 2013-06-05 | 1 | -23/+23 |
* | | mod_bosh: Return errors when appropriate (invalid XML, missing sid) | Matthew Wild | 2013-06-05 | 1 | -1/+6 |
* | | mod_bosh: Remove some very verbose logging | Matthew Wild | 2013-06-05 | 1 | -3/+0 |