aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.9->trunkMatthew Wild2013-05-018-27/+82
|\
| * Merge with FlorobMatthew Wild2013-05-011-1/+1
| |\
| | * util.dataforms: Add support for generating type='fixed' fieldsFlorian Zeitz2013-02-111-1/+1
| | |
| * | util.rfc{3484,6724}: Update to RFC 6724Florian Zeitz2013-04-303-11/+33
| | |
| * | portmanager: Also include the interface the service is listening onKim Alvefur2013-04-291-1/+1
| | |
| * | portmanager: Include port numbers the service is listening on in the info logs.Waqas Hussain2013-04-291-1/+3
| | |
| * | net.server_select: Don't limit max file descriptor number on Windows.Waqas Hussain2013-04-291-1/+2
| | |
| * | prosodyctl: Guess the country from the TLD for the cert configKim Alvefur2013-04-291-0/+5
| | |
| * | prosodyctl: Ask about the distinguished name in a in a consistent orderKim Alvefur2013-04-291-12/+15
| | |
| * | prosodyctl: Add message describing the distinguished name input expectedKim Alvefur2013-04-291-0/+2
| | |
| * | util.openssl: Write the distinguished_name part of the config in a ↵Kim Alvefur2013-04-291-1/+21
| | | | | | | | | | | | consistent order
* | | Merge 0.9->trunkMatthew Wild2013-04-291-6/+11
|\| |
| * | MUC: Allow actor == true to set roles (like affiliations)Matthew Wild2013-04-291-2/+3
| | |
| * | MUC: Allow plugins to add and handle options in the MUC config formMatthew Wild2013-04-291-4/+8
| | |
* | | Merge 0.9->trunkMatthew Wild2013-04-295-88/+156
|\| |
| * | Merge with FlorobMatthew Wild2013-04-294-12/+13
| |\ \
| * | | util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in CFlorian Zeitz2013-04-282-13/+51
| | | |
| * | | util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashesFlorian Zeitz2013-04-275-75/+105
| | | |
* | | | Merge 0.9->trunkMatthew Wild2013-04-292-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | mod_saslauth, mod_compression: Fix some cases where open_stream() was not ↵Matthew Wild2013-04-292-2/+2
| | | | | | | | | | | | | | | | being passed to/from (see df3c78221f26 and issue #338)
* | | | Merge 0.9->trunkMatthew Wild2013-04-296-13/+27
|\| | |
| * | | mod_s2s: Ensure that to/from on stream headers are always correct, fixes #338Matthew Wild2013-04-291-6/+7
| | | |
| * | | prosodyctl: Put keys and certificates in ./certs when in a source checkoutKim Alvefur2013-04-281-4/+4
| |/ /
| * | net.server*: Allow the TCP backlog parameter to be set in the configKim Alvefur2013-04-273-2/+8
| | |
| * | moduleapi: in module:provides(), add the name of the module in item._provided_byKim Alvefur2013-04-271-0/+1
| | |
| * | moduleapi: module:provides called without an item makes a copy of the ↵Kim Alvefur2013-04-271-1/+7
| | | | | | | | | | | | environment instead. Fixes warnings about non-existent globals
* | | Merge 0.9->trunkMatthew Wild2013-04-271-0/+16
|\| |
| * | moduleapi: Add module:get_option_inherited_set() to return a set that ↵Matthew Wild2013-04-271-0/+12
| | | | | | | | | | | | inherits items from a globally set set, if set
| * | moduleapi: Add module:context(host) to produce a fake API context for a ↵Matthew Wild2013-04-271-0/+4
| | | | | | | | | | | | given host (or global). module:context("*"):get_option("foo") to get global options.
* | | Merge 0.9->trunkMatthew Wild2013-04-271-2/+4
|\| |
| * | util.prosodyctl: Initialize storagemanager on the host before initializing ↵Matthew Wild2013-04-271-2/+4
| | | | | | | | | | | | usermanager. This fixes brokenness when the auth provider opens the store on load (as they all do since eeea0eb2602a) (thanks nulani)
* | | Merge 0.9->trunkMatthew Wild2013-04-261-1/+2
|\| |
| * | mod_s2s: Obey tcp_keepalives option for s2s too, and make it individually ↵Matthew Wild2013-04-261-1/+2
| | | | | | | | | | | | configurable through s2s_tcp_keepalives (thanks yeled)
* | | Merge 0.9->trunkMatthew Wild2013-04-254-39/+46
|\| |
| * | mod_admin_telnet: Add muc:create(room) (thanks SkyBlue)Matthew Wild2013-04-251-2/+12
| | |
| * | MUC: add __tostring on room metatableMatthew Wild2013-04-251-0/+4
| | |
| * | mod_c2s: Refactor <stream:error> building to allways tostring() it and only ↵Kim Alvefur2013-04-251-9/+9
| | | | | | | | | | | | call send once
| * | util.json: New, improved, fixed codepoint to UTF-8 conversion.Waqas Hussain2013-04-231-26/+11
| | |
| * | util.json: Make encode(decode("[]"))=="[]".Waqas Hussain2013-04-231-2/+10
| | |
* | | Merge 0.9->trunkMatthew Wild2013-04-232-643/+561
|\| |
| * | mod_admin_adhoc: Use util.adhocFlorian Zeitz2013-04-231-643/+530
| | |
| * | util.adhoc: New util for generating common adhoc handler patternsFlorian Zeitz2013-04-231-0/+31
| | |
* | | Merges all the way downMatthew Wild2013-04-230-0/+0
|\ \ \
| * \ \ Merge 0.9->trunkKim Alvefur2013-04-197-40/+46
| |\ \ \
| * \ \ \ Merge 0.9->trunkKim Alvefur2013-04-191-1/+1
| |\ \ \ \
* | \ \ \ \ Merge 0.9->trunkMatthew Wild2013-04-2313-51/+66
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | MergeMatthew Wild2013-04-230-0/+0
| |\ \ \ \
| | * | | | mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit ↵Matthew Wild2013-04-224-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | traceback function), to make it clearer where an error occured
| | * | | | net.server.http: Add a commentMatthew Wild2013-04-221-0/+1
| | | | | |
| | * | | | net.server.http: Ensure that event map cannot grow forever (limit to 10K ↵Matthew Wild2013-04-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | wildcard-only entries)