aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | MergeMatthew Wild2013-06-2938-1093/+1666
|\ \
| * | Merge 0.9->trunkMatthew Wild2013-06-292-1/+2
| |\|
| | * util.pposix: setrlimit(): Add missing return on error when an incorrect numbe...Matthew Wild2013-06-281-0/+1
| * | Merge 0.9->trunkMatthew Wild2013-06-261-4/+13
| |\ \
| * | | mod_s2s: Add missing global hook for read-timeoutKim Alvefur2013-06-261-0/+2
| * | | Merge 0.9->trunkMatthew Wild2013-06-241-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_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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge 0.9->trunkMatthew Wild2013-06-131-2/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-06-130-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-06-131-0/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-06-132-1/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-06-111-0/+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
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkKim 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 another place we set headers, fixes #348Matthew Wild2013-06-061-1/+0