Matthew Wild [Fri, 10 May 2013 09:46:27 +0000 (10:46 +0100)]
Merge 0.9->trunk
Kim Alvefur [Tue, 7 May 2013 15:17:32 +0000 (17:17 +0200)]
mod_admin_telnet: Add some DNS commands.
Kim Alvefur [Tue, 7 May 2013 14:51:25 +0000 (16:51 +0200)]
net.dns: Add nicer API to cached records
Waqas Hussain [Tue, 7 May 2013 14:42:44 +0000 (10:42 -0400)]
util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input.
Waqas Hussain [Tue, 7 May 2013 14:41:03 +0000 (10:41 -0400)]
util.array: Wrap tostring() output in {} (otherwise empty arrays print as "").
Waqas Hussain [Mon, 6 May 2013 23:43:59 +0000 (19:43 -0400)]
util.json: Make setmetatable local.
Waqas Hussain [Mon, 6 May 2013 23:42:54 +0000 (19:42 -0400)]
util.json: Fix variable name typo which broke util.json when util.array was missing.
Waqas Hussain [Sun, 5 May 2013 19:02:33 +0000 (15:02 -0400)]
util.json: Optimize long string parsing.
Matthew Wild [Wed, 1 May 2013 12:57:11 +0000 (13:57 +0100)]
Merge tls branch
Matthew Wild [Wed, 1 May 2013 12:57:00 +0000 (13:57 +0100)]
Merge s2s branch
Matthew Wild [Wed, 1 May 2013 12:56:42 +0000 (13:56 +0100)]
Merge sasl branch
Matthew Wild [Wed, 1 May 2013 12:54:44 +0000 (13:54 +0100)]
Close 'tls' branch
Matthew Wild [Wed, 1 May 2013 12:54:31 +0000 (13:54 +0100)]
Close 'sasl' branch
Matthew Wild [Wed, 1 May 2013 12:54:00 +0000 (13:54 +0100)]
Close 's2s' branch
Matthew Wild [Wed, 1 May 2013 12:45:42 +0000 (13:45 +0100)]
Merge 0.9->trunk
Matthew Wild [Wed, 1 May 2013 12:45:05 +0000 (13:45 +0100)]
Merge with Florob
Florian Zeitz [Tue, 30 Apr 2013 16:34:03 +0000 (18:34 +0200)]
util.rfc{3484,6724}: Update to RFC 6724
Kim Alvefur [Mon, 29 Apr 2013 17:40:39 +0000 (19:40 +0200)]
portmanager: Also include the interface the service is listening on
Waqas Hussain [Mon, 29 Apr 2013 17:03:17 +0000 (22:03 +0500)]
portmanager: Include port numbers the service is listening on in the info logs.
Waqas Hussain [Mon, 29 Apr 2013 15:26:48 +0000 (20:26 +0500)]
net.server_select: Don't limit max file descriptor number on Windows.
Kim Alvefur [Mon, 29 Apr 2013 12:01:19 +0000 (14:01 +0200)]
prosodyctl: Guess the country from the TLD for the cert config
Kim Alvefur [Mon, 29 Apr 2013 12:00:44 +0000 (14:00 +0200)]
prosodyctl: Ask about the distinguished name in a in a consistent order
Kim Alvefur [Mon, 29 Apr 2013 11:59:39 +0000 (13:59 +0200)]
prosodyctl: Add message describing the distinguished name input expected
Kim Alvefur [Mon, 29 Apr 2013 11:30:59 +0000 (13:30 +0200)]
util.openssl: Write the distinguished_name part of the config in a consistent order
Matthew Wild [Mon, 29 Apr 2013 10:27:17 +0000 (11:27 +0100)]
Merge 0.9->trunk
Matthew Wild [Mon, 29 Apr 2013 10:25:12 +0000 (11:25 +0100)]
MUC: Allow actor == true to set roles (like affiliations)
Matthew Wild [Mon, 29 Apr 2013 10:21:37 +0000 (11:21 +0100)]
MUC: Allow plugins to add and handle options in the MUC config form
Matthew Wild [Mon, 29 Apr 2013 09:54:25 +0000 (10:54 +0100)]
Merge 0.9->trunk
Matthew Wild [Mon, 29 Apr 2013 09:52:23 +0000 (10:52 +0100)]
Merge with Florob
Matthew Wild [Mon, 29 Apr 2013 09:44:18 +0000 (10:44 +0100)]
Merge 0.9->trunk
Matthew Wild [Mon, 29 Apr 2013 09:43:44 +0000 (10:43 +0100)]
mod_saslauth, mod_compression: Fix some cases where open_stream() was not being passed to/from (see
df3c78221f26 and issue #338)
Matthew Wild [Sun, 28 Apr 2013 23:36:04 +0000 (00:36 +0100)]
Merge 0.9->trunk
Matthew Wild [Sun, 28 Apr 2013 23:33:39 +0000 (00:33 +0100)]
mod_s2s: Ensure that to/from on stream headers are always correct, fixes #338
Kim Alvefur [Sun, 28 Apr 2013 14:22:01 +0000 (16:22 +0200)]
prosodyctl: Put keys and certificates in ./certs when in a source checkout
Florian Zeitz [Sun, 28 Apr 2013 00:28:42 +0000 (02:28 +0200)]
util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C
Kim Alvefur [Sat, 27 Apr 2013 20:46:01 +0000 (22:46 +0200)]
net.server*: Allow the TCP backlog parameter to be set in the config
Kim Alvefur [Sat, 27 Apr 2013 17:44:37 +0000 (19:44 +0200)]
moduleapi: in module:provides(), add the name of the module in item._provided_by
Kim Alvefur [Sat, 27 Apr 2013 17:14:22 +0000 (19:14 +0200)]
moduleapi: module:provides called without an item makes a copy of the environment instead. Fixes warnings about non-existent globals
Matthew Wild [Sat, 27 Apr 2013 17:03:19 +0000 (18:03 +0100)]
Merge 0.9->trunk
Florian Zeitz [Sat, 27 Apr 2013 15:01:31 +0000 (17:01 +0200)]
util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes
Matthew Wild [Sat, 27 Apr 2013 13:59:00 +0000 (14:59 +0100)]
moduleapi: Add module:get_option_inherited_set() to return a set that inherits items from a globally set set, if set
Matthew Wild [Sat, 27 Apr 2013 13:57:24 +0000 (14:57 +0100)]
moduleapi: Add module:context(host) to produce a fake API context for a given host (or global). module:context("*"):get_option("foo") to get global options.
Matthew Wild [Sat, 27 Apr 2013 12:11:27 +0000 (13:11 +0100)]
Merge 0.9->trunk
Matthew Wild [Sat, 27 Apr 2013 12:11:03 +0000 (13:11 +0100)]
util.prosodyctl: Initialize storagemanager on the host before initializing usermanager. This fixes brokenness when the auth provider opens the store on load (as they all do since
eeea0eb2602a) (thanks nulani)
Matthew Wild [Fri, 26 Apr 2013 11:25:53 +0000 (12:25 +0100)]
Merge 0.9->trunk
Matthew Wild [Fri, 26 Apr 2013 11:25:25 +0000 (12:25 +0100)]
mod_s2s: Obey tcp_keepalives option for s2s too, and make it individually configurable through s2s_tcp_keepalives (thanks yeled)
Matthew Wild [Thu, 25 Apr 2013 19:37:51 +0000 (20:37 +0100)]
Merge 0.9->trunk
Matthew Wild [Thu, 25 Apr 2013 19:37:20 +0000 (20:37 +0100)]
mod_admin_telnet: Add muc:create(room) (thanks SkyBlue)
Matthew Wild [Thu, 25 Apr 2013 19:36:55 +0000 (20:36 +0100)]
MUC: add __tostring on room metatable
Kim Alvefur [Thu, 25 Apr 2013 15:50:22 +0000 (17:50 +0200)]
mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once
Waqas Hussain [Tue, 23 Apr 2013 19:55:49 +0000 (15:55 -0400)]
util.json: New, improved, fixed codepoint to UTF-8 conversion.
Waqas Hussain [Tue, 23 Apr 2013 18:41:52 +0000 (14:41 -0400)]
util.json: Make encode(decode("[]"))=="[]".
Matthew Wild [Tue, 23 Apr 2013 14:38:38 +0000 (15:38 +0100)]
Merge 0.9->trunk
Matthew Wild [Tue, 23 Apr 2013 14:15:52 +0000 (15:15 +0100)]
Merges all the way down
Matthew Wild [Tue, 23 Apr 2013 14:14:47 +0000 (15:14 +0100)]
Merge 0.9->trunk
Matthew Wild [Tue, 23 Apr 2013 14:14:22 +0000 (15:14 +0100)]
Merge
Matthew Wild [Tue, 23 Apr 2013 14:13:51 +0000 (15:13 +0100)]
mod_auth_internal_plain: Don't log passwords, even at debug level
Florian Zeitz [Tue, 23 Apr 2013 12:49:48 +0000 (14:49 +0200)]
mod_admin_adhoc: Use util.adhoc
Florian Zeitz [Tue, 23 Apr 2013 12:49:31 +0000 (14:49 +0200)]
util.adhoc: New util for generating common adhoc handler patterns
Matthew Wild [Mon, 22 Apr 2013 11:35:52 +0000 (12:35 +0100)]
mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit traceback function), to make it clearer where an error occured
Matthew Wild [Mon, 22 Apr 2013 11:35:52 +0000 (12:35 +0100)]
mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit traceback function), to make it clearer where an error occured
Matthew Wild [Mon, 22 Apr 2013 11:25:00 +0000 (12:25 +0100)]
net.server.http: Add a comment
Matthew Wild [Mon, 22 Apr 2013 11:25:00 +0000 (12:25 +0100)]
net.server.http: Add a comment
Matthew Wild [Mon, 22 Apr 2013 11:24:42 +0000 (12:24 +0100)]
net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries)
Matthew Wild [Mon, 22 Apr 2013 11:24:42 +0000 (12:24 +0100)]
net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries)
Waqas Hussain [Mon, 22 Apr 2013 15:54:15 +0000 (11:54 -0400)]
storagemanager: Fix traceback in logging when store type is nil, and store is unsupported.
Kim Alvefur [Fri, 19 Apr 2013 14:16:09 +0000 (16:16 +0200)]
Merge 0.9->trunk
Kim Alvefur [Fri, 19 Apr 2013 14:14:06 +0000 (16:14 +0200)]
mod_auth_internal_hashed, mod_auth_internal_plain, mod_privacy, mod_private, mod_register, mod_vcard, mod_muc: Use module:open_store()
Kim Alvefur [Fri, 19 Apr 2013 12:44:08 +0000 (14:44 +0200)]
Merge 0.9->trunk
Kim Alvefur [Fri, 19 Apr 2013 12:42:32 +0000 (14:42 +0200)]
moduleapi: Make module:open_store() open a store named after the calling module by default
Matthew Wild [Fri, 19 Apr 2013 12:30:37 +0000 (13:30 +0100)]
Merge 0.9->trunk
Matthew Wild [Fri, 19 Apr 2013 12:29:47 +0000 (13:29 +0100)]
moduleapi: Add module:open_store() as a front-end to storagemanager.open()
Matthew Wild [Thu, 18 Apr 2013 10:14:16 +0000 (11:14 +0100)]
Merge 0.9->trunk
Matthew Wild [Thu, 18 Apr 2013 10:13:40 +0000 (11:13 +0100)]
mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress
Matthew Wild [Wed, 17 Apr 2013 23:41:25 +0000 (00:41 +0100)]
Merge 0.9->trunk
Matthew Wild [Wed, 17 Apr 2013 23:41:03 +0000 (00:41 +0100)]
net.server_select: Don't call onconnect twice for SSL connections
Matthew Wild [Wed, 17 Apr 2013 23:40:09 +0000 (00:40 +0100)]
Merge backout
Matthew Wild [Wed, 17 Apr 2013 23:39:59 +0000 (00:39 +0100)]
Backed out changeset
f2631a14b953
Matthew Wild [Wed, 17 Apr 2013 23:10:52 +0000 (00:10 +0100)]
Merge 0.9->trunk
Matthew Wild [Wed, 17 Apr 2013 23:08:58 +0000 (00:08 +0100)]
net.http: When HTTP request fails due to a network or SSL error, call the callback to let it know
Waqas Hussain [Wed, 17 Apr 2013 19:28:20 +0000 (15:28 -0400)]
net.http.server: The correct Connection header value to look for is Keep-Alive, not keep-alive.
Kim Alvefur [Wed, 17 Apr 2013 17:11:57 +0000 (19:11 +0200)]
Merge 0.9->trunk
Kim Alvefur [Wed, 17 Apr 2013 17:10:04 +0000 (19:10 +0200)]
net.server_select: Don't call onconnect twice on SSL connections
Matthew Wild [Wed, 17 Apr 2013 13:32:26 +0000 (14:32 +0100)]
mod_pubsub: Only assign id to item element if there is one
Matthew Wild [Wed, 17 Apr 2013 13:20:02 +0000 (14:20 +0100)]
Merge 0.9->trunk
Matthew Wild [Wed, 17 Apr 2013 13:12:47 +0000 (14:12 +0100)]
mod_pubsub: Add id to stored item when auto-generated. Fixes #335
Waqas Hussain [Tue, 16 Apr 2013 22:18:22 +0000 (18:18 -0400)]
net.server_select: Add and improve some comments.
Waqas Hussain [Tue, 16 Apr 2013 22:15:10 +0000 (18:15 -0400)]
net.server_select: Move socket timeout cleanup code out of a timer, into the select loop (which makes util.timer the only timer using server_select._addtimer).
Kim Alvefur [Wed, 17 Apr 2013 19:30:44 +0000 (21:30 +0200)]
net.server_select: Normalize indentation
Matthew Wild [Mon, 15 Apr 2013 20:26:20 +0000 (21:26 +0100)]
Merge 0.9->trunk
Matthew Wild [Mon, 15 Apr 2013 20:25:59 +0000 (21:25 +0100)]
net.http.parser: Remove accidentally-committed debugging
Matthew Wild [Mon, 15 Apr 2013 20:22:45 +0000 (21:22 +0100)]
Merge 0.9->trunk
Matthew Wild [Mon, 15 Apr 2013 20:21:57 +0000 (21:21 +0100)]
net.http.parser: Fix off-by-one error in chunked encoding parser
Kim Alvefur [Mon, 15 Apr 2013 17:37:15 +0000 (19:37 +0200)]
mod_s2s: Add missing space
Matthew Wild [Mon, 15 Apr 2013 15:43:08 +0000 (16:43 +0100)]
Merge 0.9->trunk
Matthew Wild [Mon, 15 Apr 2013 11:30:40 +0000 (12:30 +0100)]
Makefile: Specify explicit mode when installing prosody.version, to avoid it defaulting to something nasty (executable)
Matthew Wild [Fri, 12 Apr 2013 19:26:35 +0000 (20:26 +0100)]
util.http: Refactor and import all necessary functions
Matthew Wild [Thu, 11 Apr 2013 23:45:46 +0000 (00:45 +0100)]
Merge 0.9->trunk
Matthew Wild [Thu, 11 Apr 2013 23:44:49 +0000 (00:44 +0100)]
util.iterators: Add ripairs() (ipairs() in reverse) (thanks Maranda)
Matthew Wild [Thu, 11 Apr 2013 23:32:10 +0000 (00:32 +0100)]
Merge 0.9->trunk