aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.9->trunkMatthew Wild2013-06-241-1/+1
|\
| * mod_storage_sql2: Use correct variable (Thanks SkyBlue and Florob)Kim Alvefur2013-06-231-1/+1
* | mod_admin_telnet: Refactor s2s:show()Kim Alvefur2013-06-201-55/+55
* | mod_admin_telnet: Generate session names the same way as in s2smanagerKim Alvefur2013-06-201-1/+1
* | mod_admin_telnet: Refactor s2s:close and s2s:closeallKim Alvefur2013-06-201-53/+15
* | mod_register: Fix indentationKim Alvefur2013-06-191-1/+1
* | mod_admin_telnet: Refactor s2s:showcert()Kim Alvefur2013-06-191-8/+3
* | net.dns: Support IPv6 addresses in resolv.confFlorian Zeitz2013-06-181-6/+13
* | Merge 0.9->trunkMatthew Wild2013-06-183-23/+121
|\|
| * mod_s2s/s2sout.lib: Remove unused variables and importsMatthew Wild2013-06-181-6/+2
| * mod_s2s/s2sout.lib: Remove reference to undefined globalMatthew Wild2013-06-181-1/+0
| * mod_s2s/s2sout.lib: Use new util.net.local_addresses() to fetch local interfa...Matthew Wild2013-06-181-12/+5
| * mod_s2s/s2sout.lib: Only attempt to create an IPv6 socket if LuaSocket suppor...Matthew Wild2013-06-181-2/+5
| * util.net: Add util.net, containing local_addresses() (removed from LuaSocket ...Matthew Wild2013-06-182-2/+109
* | mod_tls: Remove debug statementKim Alvefur2013-06-161-1/+0
* | additional fix for erlparse loading in ejabberd2prosody.luaVadim Misbakh-Soloviov2013-06-141-0/+1
* | package{,c}path fixes for migration toolsVadim Misbakh-Soloviov2013-06-145-5/+34
* | Merge the mergeMatthew Wild2013-06-139-223/+296
|\ \
| * | mod_muc: Add Ad-Hoc command to destroy MUC roomsFlorian Zeitz2013-06-051-0/+36
| * | mod_muc: Utilize mod_disco, instead of reimplementing disco handlingFlorian Zeitz2013-06-051-14/+9
| * | mod_pubsub: Utilize mod_disco, instead of reimplementing disco handlingFlorian Zeitz2013-06-051-130/+108
| * | mod_disco: Allow ansering disco requests including nodes, and adding custom i...Florian Zeitz2013-06-041-8/+35
| * | mod_http_files: Put the MIME type map in a global shared tableKim Alvefur2013-06-131-1/+1
| * | util.sasl.external: Add SASL EXTERNAL mechanismKim Alvefur2013-06-132-0/+26
| * | prosody: Remove global ssl context, no longer usedKim Alvefur2013-06-131-6/+0
| * | mod_tls: Refactor to allow separate SSL configuration for c2s and s2s connect...Kim Alvefur2013-06-131-26/+36
| * | certmanager: Overhaul of how ssl configs are built.Kim Alvefur2013-06-131-38/+45
* | | Merge 0.9->trunkMatthew Wild2013-06-131-1/+5
|\ \ \ | |/ / |/| / | |/
| * util.dataforms: Return nil for empty list-mutli responses, to be consistent w...Florian Zeitz2013-06-141-1/+5
* | Merge 0.9->trunkMatthew Wild2013-06-131-2/+3
|\|
| * mod_pep: When a client supplies no id on a published item, reflect our genera...Florian Zeitz2013-06-131-2/+3
* | Merge 0.9->trunkMatthew Wild2013-06-130-0/+0
|\|
| * mod_muc: Fix incorrect variable nameMatthew Wild2013-05-211-1/+1
* | Merge 0.9->trunkMatthew Wild2013-06-131-0/+5
|\|
| * certmanager: Add single_dh_use and single_ecdh_use to default optionsMatthew Wild2013-06-131-0/+5
* | Merge 0.9->trunkMatthew Wild2013-06-132-1/+4
|\|
| * certmanager: Set ssl.curve to 'secp384r1' by default, to enable ECC ciphersMatthew Wild2013-06-131-1/+1
| * util.pubsub: Check whether node exists, when deletingFlorian Zeitz2013-06-121-0/+3
* | 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