aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge merge merge mergeMatthew Wild2013-05-110-0/+0
|\
| * Merge 0.9->trunkKim Alvefur2013-05-101-1/+1
| |\
* | \ Merge 0.9->trunkMatthew Wild2013-05-112-6/+7
|\ \ \ | |/ / |/| |
| * | prosody.cfg.lua.dist: Fix my s2s_secure(_auth) messMatthew Wild2013-05-111-5/+6
| |/
| * mod_c2s: Fix session:close() when a stanza is passed as reasonKim Alvefur2013-05-101-1/+1
| |
* | Merge 0.9->trunkMatthew Wild2013-05-101-3/+0
|\|
| * mod_pubsub: Remove nodeid check added in 989acb4ad1de that wasn't neededKim Alvefur2013-05-091-3/+0
| |
* | Merge 0.9->trunkMatthew Wild2013-05-104-195/+203
|\|
| * mod_admin_telnet: Add some DNS commands.Kim Alvefur2013-05-071-0/+41
| |
| * net.dns: Add nicer API to cached recordsKim Alvefur2013-05-071-0/+4
| |
| * util.json: New, faster, stricter, more compliant JSON decoder. Now returns ↵Waqas Hussain2013-05-071-192/+155
| | | | | | | | nil,err instead of throwing errors on invalid input.
| * util.array: Wrap tostring() output in {} (otherwise empty arrays print as "").Waqas Hussain2013-05-071-1/+1
| |
| * util.json: Make setmetatable local.Waqas Hussain2013-05-061-1/+1
| |
| * util.json: Fix variable name typo which broke util.json when util.array was ↵Waqas Hussain2013-05-061-1/+1
| | | | | | | | missing.
| * util.json: Optimize long string parsing.Waqas Hussain2013-05-051-5/+5
| |
* | Merge tls branchMatthew Wild2013-05-010-0/+0
|\ \
| * | Close 'tls' branchorigin/vault/tlsorigin/tlstlsMatthew Wild2013-05-010-0/+0
| | |
* | | Merge s2s branchMatthew Wild2013-05-010-0/+0
|\ \ \
| * | | Close 's2s' branchorigin/vault/s2sorigin/s2ss2sMatthew Wild2013-05-010-0/+0
| | | |
* | | | Merge sasl branchMatthew Wild2013-05-010-0/+0
|\ \ \ \
| * | | | Close 'sasl' branchorigin/vault/saslorigin/saslsaslMatthew Wild2013-05-010-0/+0
| | | | |
* | | | | 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.