util.hashes: Silence compiler warning about pointer signedness

mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. while waiting for an external event). Needs a gallon or two of testing.

mod_disco: Check for host type == 'local' ('normal' never existed)

moduleapi: module:get_host_type() now returns 'global' for * and 'local' for non-components

Merge 0.9->trunk

mod_admin_telnet, mod_s2s: Fix reporting of certificate chain validation details

util.hashes: Correct argument order

mod_s2s: Improve policy check

mod_s2s: Log certificate identity validation result

mod_storage_sql2: Do an early return and drop an indentation level

mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details

mod_register: Use more specific get_option variants

mod_adhoc: Add local_user permission

mod_adhoc: Use mod_disco for disco handling

mod_adhoc: Sort commands by node. This guarantees the order remains the same across restarts etc.

Merge 0.9->trunk

adhoc.lib: Don't build error reply from reply stanza

mod_c2s: Change default of tcp_keepalives to true, and make it individually configurable through c2s_tcp_keepalives

Merge 0.9->trunk

net.server_event: Pass ondrain handler from listener

net.http.server: Fix Keep-Alive requests with HTTP 1.0

Merge 0.9->trunk

util.net: Fix compilation on Windows (outputs an empty list of addresses for now) (tested only in my head)

Merge 0.9->trunk

util.net: Include missing header needed for successful compiltion on FreeBSD

util.events: Remove varargs, event handlers can now only accept a single parameter

mod_bosh, mod_c2s: No longer fire stream-features globally (nobody uses it, and shared modules make it easy for global modules to hook per-host now)

rostermanager, mod_groups: Change roster-load event to pass an event table for consistency

Merge 0.9->trunk

certmanager: Set our own default cipher string, which includes only ciphers regarded as 'HIGH' strength (by OpenSSL). In particular this disables RC4.

util.sql: Do lazy fetching of affected/rowcount

Backed out changeset 3c57c2281087

util.sql: Don't fetch row count of result sets for queries that don't have result sets

mod_storage_sql2: Add archive store with append and find methods

mod_storage_sql2: Create an additional table `prosodyarchive` for chronological collections

util.sql: Set charset and collation for MySQL when creating tables

Remove plugins/storage/sqlbasic.lib.lua, which seems obsolete

Merge 0.9->trunk

mod_storage_sql2: Remove from 0.9

mod_storage_sql2: Support XML serialization for stanzas.

mod_storage_sql2: Keep available store types in a table

mod_storage_sql2: Fix iteration over users and stores

mod_storage_sql2: Make sure the user field is not NULL

Merge 0.9->trunk

net.dns, net.adns: Make sure errors from net.server are propagated (thanks asterix)

Merge 0.9->trunk

mod_component: Local imports for some functions, including xpcall

mod_bosh: pcall() core_process_stanza per stanza, to bring in line with other listeners. This ensures that stanzas following a traceback-causing stanza in a request will still be processed (as would happen on normal c2s).

mod_bosh: Only pass stanza to core_process_stanza if it wasn't dropped by filters

Merge 0.9->trunk

mod_component: xpcall() stanza processing, as per other listeners, preventing potentially harmful 'top-level errors'

prosodyctl: Import local_addresses from the new util.net intead of luasocket

Merge 0.9->trunk

mod_admin_adhoc: Fix node of the "Get List of Online Users" command

Merge

util.pposix: Correctly handle 'unlimited' limits (RLIM_INFINITY), by returning and accepting the string 'unlimited' in get/setrlimit()

Merge 0.9->trunk

util.pposix: setrlimit(): Add missing return on error when an incorrect number of arguments are passed

mod_http_files: Put the MIME type map in a global shared table instead of per-host

Merge 0.9->trunk

net.http: Include port number (when non-standard) in the Host header of outgoing requests, as per the HTTP RFC

mod_s2s: Add missing global hook for read-timeout

Merge 0.9->trunk

mod_storage_sql2: Use correct variable (Thanks SkyBlue and Florob)

mod_admin_telnet: Refactor s2s:show()

mod_admin_telnet: Generate session names the same way as in s2smanager

mod_admin_telnet: Refactor s2s:close and s2s:closeall

mod_register: Fix indentation

mod_admin_telnet: Refactor s2s:showcert()

net.dns: Support IPv6 addresses in resolv.conf

Merge 0.9->trunk

mod_s2s/s2sout.lib: Remove unused variables and imports

mod_s2s/s2sout.lib: Remove reference to undefined global

mod_s2s/s2sout.lib: Use new util.net.local_addresses() to fetch local interface addresses

mod_s2s/s2sout.lib: Only attempt to create an IPv6 socket if LuaSocket supports IPv6

util.net: Add util.net, containing local_addresses() (removed from LuaSocket 3.0)

mod_tls: Remove debug statement

additional fix for erlparse loading in ejabberd2prosody.lua

package{,c}path fixes for migration tools

Merge the merge

Merge 0.9->trunk

util.dataforms: Return nil for empty list-mutli responses, to be consistent with other readers

mod_muc: Add Ad-Hoc command to destroy MUC rooms

mod_muc: Utilize mod_disco, instead of reimplementing disco handling

mod_pubsub: Utilize mod_disco, instead of reimplementing disco handling

mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests

mod_http_files: Put the MIME type map in a global shared table

util.sasl.external: Add SASL EXTERNAL mechanism

prosody: Remove global ssl context, no longer used

mod_tls: Refactor to allow separate SSL configuration for c2s and s2s connections

certmanager: Overhaul of how ssl configs are built.

Merge 0.9->trunk

mod_pep: When a client supplies no id on a published item, reflect our generated id back to it

Merge 0.9->trunk

mod_muc: Fix incorrect variable name

Merge 0.9->trunk

certmanager: Add single_dh_use and single_ecdh_use to default options

Merge 0.9->trunk

certmanager: Set ssl.curve to 'secp384r1' by default, to enable ECC ciphers

util.pubsub: Check whether node exists, when deleting

Merge 0.9->trunk

certmanager: Use 'curve' and 'dhparam' options from ssl config if present

mod_admin_telnet: Add server:memory() command to view details of Prosody's memory usage

mod_bosh: Remove Connection: keep-alive header (conflicts with new net.http.server)

mod_bosh: Fix global write

mod_c2s, mod_s2s: Fire an event on read timeouts

mod_c2s: Become a shared module and allow being disabled on some virtualhosts

mod_bosh: Reduce a little code.

Merge 0.9->trunk

mod_admin_telnet: Fix another wrong boolean expression

Merge 0.9->trunk

net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks elghinn)

mod_admin_telnet: Simplify IPv6 detection, fixes rare traceback

mod_s2s: Set s2s_session.ip

mod_bosh: Make waiting_requests and dead_sessions shared to preserve across reloads

mod_muc: Include status code 332 on service shutdown (thanks mathieui)

mod_bosh: Don't tostring() stream:features when passing to session.send().

prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates

certmanager: Complain if key or certificate is missing from SSL config.

prosodyctl: Add 'prosodyctl check --help'