Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | util.hashes: inttypes.h not available with MS Windows SDK, use MS specific ↵ | Waqas Hussain | 2013-05-13 | 1 | -0/+5 | |
| | | | | | | | | __int32 instead. | |||||
* | | Merge merge merge merge | Matthew Wild | 2013-05-11 | 0 | -0/+0 | |
|\ \ | ||||||
| * \ | Merge 0.9->trunk | Kim Alvefur | 2013-05-10 | 1 | -1/+1 | |
| |\ \ | ||||||
* | \ \ | Merge 0.9->trunk | Matthew Wild | 2013-05-11 | 2 | -6/+7 | |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | ||||||
| * | | prosody.cfg.lua.dist: Fix my s2s_secure(_auth) mess | Matthew Wild | 2013-05-11 | 1 | -5/+6 | |
| |/ | ||||||
| * | mod_c2s: Fix session:close() when a stanza is passed as reason | Kim Alvefur | 2013-05-10 | 1 | -1/+1 | |
| | | ||||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-05-10 | 1 | -3/+0 | |
|\| | ||||||
| * | mod_pubsub: Remove nodeid check added in 989acb4ad1de that wasn't needed | Kim Alvefur | 2013-05-09 | 1 | -3/+0 | |
| | | ||||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-05-10 | 4 | -195/+203 | |
|\| | ||||||
| * | mod_admin_telnet: Add some DNS commands. | Kim Alvefur | 2013-05-07 | 1 | -0/+41 | |
| | | ||||||
| * | net.dns: Add nicer API to cached records | Kim Alvefur | 2013-05-07 | 1 | -0/+4 | |
| | | ||||||
| * | util.json: New, faster, stricter, more compliant JSON decoder. Now returns ↵ | Waqas Hussain | 2013-05-07 | 1 | -192/+155 | |
| | | | | | | | | nil,err instead of throwing errors on invalid input. | |||||
| * | util.array: Wrap tostring() output in {} (otherwise empty arrays print as ""). | Waqas Hussain | 2013-05-07 | 1 | -1/+1 | |
| | | ||||||
| * | util.json: Make setmetatable local. | Waqas Hussain | 2013-05-06 | 1 | -1/+1 | |
| | | ||||||
| * | util.json: Fix variable name typo which broke util.json when util.array was ↵ | Waqas Hussain | 2013-05-06 | 1 | -1/+1 | |
| | | | | | | | | missing. | |||||
| * | util.json: Optimize long string parsing. | Waqas Hussain | 2013-05-05 | 1 | -5/+5 | |
| | | ||||||
* | | Merge tls branch | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
|\ \ | ||||||
| * | | Close 'tls' branchorigin/vault/tlsorigin/tlstls | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
| | | | ||||||
* | | | Merge s2s branch | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
|\ \ \ | ||||||
| * | | | Close 's2s' branchorigin/vault/s2sorigin/s2ss2s | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
| | | | | ||||||
* | | | | Merge sasl branch | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
|\ \ \ \ | ||||||
| * | | | | Close 'sasl' branchorigin/vault/saslorigin/saslsasl | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
| | | | | | ||||||
* | | | | | Merge 0.9->trunk | Matthew Wild | 2013-05-01 | 8 | -27/+82 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Merge with Florob | Matthew Wild | 2013-05-01 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | util.dataforms: Add support for generating type='fixed' fields | Florian Zeitz | 2013-02-11 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | util.rfc{3484,6724}: Update to RFC 6724 | Florian Zeitz | 2013-04-30 | 3 | -11/+33 | |
| | | | | | | ||||||
| * | | | | | portmanager: Also include the interface the service is listening on | Kim Alvefur | 2013-04-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | portmanager: Include port numbers the service is listening on in the info logs. | Waqas Hussain | 2013-04-29 | 1 | -1/+3 | |
| | | | | | | ||||||
| * | | | | | net.server_select: Don't limit max file descriptor number on Windows. | Waqas Hussain | 2013-04-29 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | prosodyctl: Guess the country from the TLD for the cert config | Kim Alvefur | 2013-04-29 | 1 | -0/+5 | |
| | | | | | | ||||||
| * | | | | | prosodyctl: Ask about the distinguished name in a in a consistent order | Kim Alvefur | 2013-04-29 | 1 | -12/+15 | |
| | | | | | | ||||||
| * | | | | | prosodyctl: Add message describing the distinguished name input expected | Kim Alvefur | 2013-04-29 | 1 | -0/+2 | |
| | | | | | | ||||||
| * | | | | | util.openssl: Write the distinguished_name part of the config in a ↵ | Kim Alvefur | 2013-04-29 | 1 | -1/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | consistent order | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-29 | 1 | -6/+11 | |
|\| | | | | | ||||||
| * | | | | | MUC: Allow actor == true to set roles (like affiliations) | Matthew Wild | 2013-04-29 | 1 | -2/+3 | |
| | | | | | | ||||||
| * | | | | | MUC: Allow plugins to add and handle options in the MUC config form | Matthew Wild | 2013-04-29 | 1 | -4/+8 | |
| | | | | | | ||||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-29 | 5 | -88/+156 | |
|\| | | | | | ||||||
| * | | | | | Merge with Florob | Matthew Wild | 2013-04-29 | 4 | -12/+13 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C | Florian Zeitz | 2013-04-28 | 2 | -13/+51 | |
| | | | | | | | ||||||
| * | | | | | | util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes | Florian Zeitz | 2013-04-27 | 5 | -75/+105 | |
| | | | | | | | ||||||
* | | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-29 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | mod_saslauth, mod_compression: Fix some cases where open_stream() was not ↵ | Matthew Wild | 2013-04-29 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | being passed to/from (see df3c78221f26 and issue #338) | |||||
* | | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-29 | 6 | -13/+27 | |
|\| | | | | | | ||||||
| * | | | | | | mod_s2s: Ensure that to/from on stream headers are always correct, fixes #338 | Matthew Wild | 2013-04-29 | 1 | -6/+7 | |
| | | | | | | | ||||||
| * | | | | | | prosodyctl: Put keys and certificates in ./certs when in a source checkout | Kim Alvefur | 2013-04-28 | 1 | -4/+4 | |
| |/ / / / / | ||||||
| * | | | | | net.server*: Allow the TCP backlog parameter to be set in the config | Kim Alvefur | 2013-04-27 | 3 | -2/+8 | |
| | | | | | | ||||||
| * | | | | | moduleapi: in module:provides(), add the name of the module in item._provided_by | Kim Alvefur | 2013-04-27 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | moduleapi: module:provides called without an item makes a copy of the ↵ | Kim Alvefur | 2013-04-27 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | environment instead. Fixes warnings about non-existent globals | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-27 | 1 | -0/+16 | |
|\| | | | | | ||||||
| * | | | | | moduleapi: Add module:get_option_inherited_set() to return a set that ↵ | Matthew Wild | 2013-04-27 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | inherits items from a globally set set, if set |