| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge 0.9->trunk | Matthew Wild | 2013-06-24 | 1 | -1/+1 |
|\ |
|
| * | mod_storage_sql2: Use correct variable (Thanks SkyBlue and Florob) | Kim Alvefur | 2013-06-23 | 1 | -1/+1 |
* | | mod_admin_telnet: Refactor s2s:show() | Kim Alvefur | 2013-06-20 | 1 | -55/+55 |
* | | mod_admin_telnet: Generate session names the same way as in s2smanager | Kim Alvefur | 2013-06-20 | 1 | -1/+1 |
* | | mod_admin_telnet: Refactor s2s:close and s2s:closeall | Kim Alvefur | 2013-06-20 | 1 | -53/+15 |
* | | mod_register: Fix indentation | Kim Alvefur | 2013-06-19 | 1 | -1/+1 |
* | | mod_admin_telnet: Refactor s2s:showcert() | Kim Alvefur | 2013-06-19 | 1 | -8/+3 |
* | | net.dns: Support IPv6 addresses in resolv.conf | Florian Zeitz | 2013-06-18 | 1 | -6/+13 |
* | | Merge 0.9->trunk | Matthew Wild | 2013-06-18 | 3 | -23/+121 |
|\| |
|
| * | mod_s2s/s2sout.lib: Remove unused variables and imports | Matthew Wild | 2013-06-18 | 1 | -6/+2 |
| * | mod_s2s/s2sout.lib: Remove reference to undefined global | Matthew Wild | 2013-06-18 | 1 | -1/+0 |
| * | mod_s2s/s2sout.lib: Use new util.net.local_addresses() to fetch local interfa... | Matthew Wild | 2013-06-18 | 1 | -12/+5 |
| * | mod_s2s/s2sout.lib: Only attempt to create an IPv6 socket if LuaSocket suppor... | Matthew Wild | 2013-06-18 | 1 | -2/+5 |
| * | util.net: Add util.net, containing local_addresses() (removed from LuaSocket ... | Matthew Wild | 2013-06-18 | 2 | -2/+109 |
* | | mod_tls: Remove debug statement | Kim Alvefur | 2013-06-16 | 1 | -1/+0 |
* | | additional fix for erlparse loading in ejabberd2prosody.lua | Vadim Misbakh-Soloviov | 2013-06-14 | 1 | -0/+1 |
* | | package{,c}path fixes for migration tools | Vadim Misbakh-Soloviov | 2013-06-14 | 5 | -5/+34 |
* | | 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 |