Close 's2s' branch

Merge sasl branch

Close 'tls' branch

Close 'sasl' branch

Merge 0.9->trunk

Merge with Florob

util.rfc{3484,6724}: Update to RFC 6724

util.dataforms: Add support for generating type='fixed' fields

portmanager: Also include the interface the service is listening on

portmanager: Include port numbers the service is listening on in the info logs.

net.server_select: Don't limit max file descriptor number on Windows.

prosodyctl: Guess the country from the TLD for the cert config

prosodyctl: Ask about the distinguished name in a in a consistent order

prosodyctl: Add message describing the distinguished name input expected

util.openssl: Write the distinguished_name part of the config in a consistent order

Merge 0.9->trunk

MUC: Allow actor == true to set roles (like affiliations)

MUC: Allow plugins to add and handle options in the MUC config form

Merge 0.9->trunk

Merge with Florob

util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C

util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes

Merge 0.9->trunk

mod_saslauth, mod_compression: Fix some cases where open_stream() was not being passed to/from (see df3c78221f26 and issue #338)

Merge 0.9->trunk

mod_s2s: Ensure that to/from on stream headers are always correct, fixes #338

prosodyctl: Put keys and certificates in ./certs when in a source checkout

net.server*: Allow the TCP backlog parameter to be set in the config

moduleapi: in module:provides(), add the name of the module in item._provided_by

moduleapi: module:provides called without an item makes a copy of the environment instead. Fixes warnings about non-existent globals

Merge 0.9->trunk

moduleapi: Add module:get_option_inherited_set() to return a set that inherits items from a globally set set, if set

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.

Merge 0.9->trunk

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)

Merge 0.9->trunk

mod_s2s: Obey tcp_keepalives option for s2s too, and make it individually configurable through s2s_tcp_keepalives (thanks yeled)

Merge 0.9->trunk

mod_admin_telnet: Add muc:create(room) (thanks SkyBlue)

MUC: add __tostring on room metatable

mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once

util.json: New, improved, fixed codepoint to UTF-8 conversion.

util.json: Make encode(decode("[]"))=="[]".

Merge 0.9->trunk

mod_admin_adhoc: Use util.adhoc

util.adhoc: New util for generating common adhoc handler patterns

Merges all the way down

Merge 0.9->trunk

Merge

mod_auth_internal_plain: Don't log passwords, even at debug level

mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit traceback function), to make it clearer where an error occured

net.server.http: Add a comment

net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries)

mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit traceback function), to make it clearer where an error occured

net.server.http: Add a comment

net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries)

storagemanager: Fix traceback in logging when store type is nil, and store is unsupported.

Merge 0.9->trunk

mod_auth_internal_hashed, mod_auth_internal_plain, mod_privacy, mod_private, mod_register, mod_vcard, mod_muc: Use module:open_store()

Merge 0.9->trunk

moduleapi: Make module:open_store() open a store named after the calling module by default

Merge 0.9->trunk

moduleapi: Add module:open_store() as a front-end to storagemanager.open()

Merge 0.9->trunk

mod_storage_sql2 (temporary name), sql.lib, util.sql: New SQL API supporting cross-module connection sharing, transactions and Things - a work in progress

Merge 0.9->trunk

net.server_select: Don't call onconnect twice for SSL connections

Merge backout

Backed out changeset f2631a14b953

Merge 0.9->trunk

net.http: When HTTP request fails due to a network or SSL error, call the callback to let it know

net.http.server: The correct Connection header value to look for is Keep-Alive, not keep-alive.

net.server_select: Add and improve some comments.

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).

net.server_select: Normalize indentation

Merge 0.9->trunk

net.server_select: Don't call onconnect twice on SSL connections

mod_pubsub: Only assign id to item element if there is one

Merge 0.9->trunk

mod_pubsub: Add id to stored item when auto-generated. Fixes #335

Merge 0.9->trunk

net.http.parser: Remove accidentally-committed debugging

Merge 0.9->trunk

net.http.parser: Fix off-by-one error in chunked encoding parser

mod_s2s: Add missing space

Merge 0.9->trunk

Makefile: Specify explicit mode when installing prosody.version, to avoid it defaulting to something nasty (executable)

util.http: Refactor and import all necessary functions

prosodyctl: Bump util.pposix version for API change

Merge 0.9->trunk

util.iterators: Add ripairs() (ipairs() in reverse) (thanks Maranda)

Merge 0.9->trunk

net.http: Swap response and request parameters passed to callback (will break some modules)

util.httpstream: Unused, remove

net.http: Switch from util.httpstream to net.http.parser, introduces small but backwards-incompatible API changes - see http://prosody.im/doc/developers/http

net.http.parser: Fix chunked encoding response parsing, and make it more robust

net.http.parser: Convert status_code to a number before trying to compare it to numbers

net.http.parser: Break when no more usable data in buffer (client part of e5ec60dfb202)

net.http.parser: Depend on util.http instead of net.http for urlencode

sessionmanager, s2smanager: Remove unused imports

net.http, util.http: Move definitions of urlencode/decode and formencode/decode to util.http (possible to use them without unnecessary network-related dependencies)

Merge 0.9->trunk

prosodyctl: Bump util.pposix version for API change

Merge 0.9->trunk

mod_s2s: Adjust priority of route/remote hooks to negative values (like most other internal hooks)

Merge 0.9->trunk

mod_posix: Improve error message for a pposix version mismatch

mod_posix, util.pposix: Bump version for API change

mod_posix: Pass logger name to syslog, so that sources now get logged

util.pposix: syslog(): Support an optional source parameter (producing messages of the form '<source>: <message>'

net.http: Throw error when connecting to a http:// URL without LuaSec available

sessionmanager, s2smanager: Remove open_session tracing

Merge 0.9->trunk

mod_pubsub: Send bad-request when no action specified (thanks Maranda)

Merge 0.9->trunk

mod_pubsub: Don't attempt to handle iq stanzas with no action element

Merge 0.9->trunk

util.datamanager: Clear the cache of created directories on storage failure, and retry

util.datamanager: expose path decode and encode functions.

net.http.server: add API to allow firing events directly on the server.