Merge
|
Matthew Wild |
Sun, 12 Jan 2014 06:19:55 -0500 |
mod_storage_sql2: Fix syntax error in subquery (Thanks Lance)
|
Kim Alvefur |
Sun, 05 Jan 2014 23:38:34 +0100 |
Merge 0.9->0.10
|
Matthew Wild |
Sun, 12 Jan 2014 06:19:37 -0500 |
Tagging 0.9.3
|
Matthew Wild |
Sun, 12 Jan 2014 06:17:40 -0500 |
mod_tls: Log error when TLS initialization fails
0.9.3
|
Matthew Wild |
Sun, 12 Jan 2014 06:16:49 -0500 |
mod_s2s: Include IP in log messages, if host is unavailable
|
Florian Zeitz |
Sun, 05 Jan 2014 22:21:50 +0100 |
tools/migration/migrator/prosody_files: Fix undefined global access of ‘error’, print the actual error message and correct file path in the error message when we fail to load a file, skip broken files instead of failing migration.
|
Waqas Hussain |
Fri, 03 Jan 2014 15:52:52 -0500 |
Merge 0.10->trunk and Happy New Year!
|
Kim Alvefur |
Tue, 31 Dec 2013 19:09:34 +0100 |
util.pubsub: Separate data from node configuration
|
Kim Alvefur |
Mon, 30 Dec 2013 23:49:23 +0100 |
util.pubsub: Fire events on more actions
|
Kim Alvefur |
Thu, 26 Dec 2013 18:14:34 +0100 |
mod_pubsub: Don't sent error replies from service disco events, let mod_disco handle that
|
Kim Alvefur |
Mon, 30 Dec 2013 21:49:17 +0100 |
mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. Conflicting items are removed.
|
Kim Alvefur |
Wed, 25 Dec 2013 22:37:52 +0100 |
mod_storage_sql2: Include user, host and store in id lookup
|
Kim Alvefur |
Wed, 25 Dec 2013 15:28:55 +0100 |
net.server_{select,event}: addclient: Handle missing getaddrinfo
|
Kim Alvefur |
Mon, 23 Dec 2013 23:23:59 +0100 |
net.server_{select,event}: addclient: Use getaddrinfo to detect IP address type if no socket type argument given. (Argument must be given for non-TCP)
|
Kim Alvefur |
Mon, 23 Dec 2013 17:57:53 +0100 |
net.server_{select,event}: addclient: Add argument for overriding socket type
|
Kim Alvefur |
Mon, 23 Dec 2013 17:55:41 +0100 |
net/http: Use server.addclient
|
daurnimator |
Wed, 18 Dec 2013 19:00:24 -0500 |
net/server: addclient: wrapclient already calls startconnection for us
|
daurnimator |
Wed, 18 Dec 2013 18:11:47 -0500 |
net/server_event: pcall require ssl rather than relying on globals
|
daurnimator |
Wed, 18 Dec 2013 18:11:17 -0500 |
net/server_select: Fix typo
|
daurnimator |
Wed, 18 Dec 2013 18:06:33 -0500 |
net/server_select: addclient: Check arguments
|
daurnimator |
Wed, 18 Dec 2013 17:55:03 -0500 |
net/server_select: addclient: Check for failure correctly; remove wrapconnection call on failure
|
daurnimator |
Wed, 18 Dec 2013 17:54:31 -0500 |
net/server_event: add_client should have same arguments no-matter the server backend
|
daurnimator |
Wed, 18 Dec 2013 17:52:28 -0500 |
net/server_select: Check arguments to add_server correctly
|
daurnimator |
Wed, 18 Dec 2013 17:51:27 -0500 |
net/server_select: pcall require ssl (easy to forget to require ssl)
|
daurnimator |
Wed, 18 Dec 2013 17:50:38 -0500 |
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 18 Dec 2013 18:37:38 +0100 |
Merge 0.9->0.10
|
Kim Alvefur |
Wed, 18 Dec 2013 18:36:54 +0100 |
mod_component: Enable TCP keepalives on component streams
|
Kim Alvefur |
Wed, 18 Dec 2013 18:35:35 +0100 |
mod_component: Decrease priority of component auth hook
|
Kim Alvefur |
Wed, 18 Dec 2013 18:34:22 +0100 |
Merge 0.10->trunk
|
Matthew Wild |
Mon, 16 Dec 2013 23:32:29 +0000 |
Merge 0.9->0.10
|
Matthew Wild |
Mon, 16 Dec 2013 23:32:11 +0000 |
net.server_select: Don't remove the socket from sendlist when we might have data in the buffer (we'll now let sendbuffer() take care of that) (thanks daurnimator)
|
Matthew Wild |
Mon, 16 Dec 2013 23:31:43 +0000 |
net.http: assert() for socket creation success so it doesn't silently fail (thanks daurnimator)
|
Matthew Wild |
Mon, 16 Dec 2013 23:24:16 +0000 |
Merge with trunk
|
Matthew Wild |
Mon, 16 Dec 2013 02:05:16 +0000 |
Merge 0.10->trunk
|
Matthew Wild |
Mon, 16 Dec 2013 02:04:43 +0000 |
Merge 0.9->0.10
|
Matthew Wild |
Mon, 16 Dec 2013 02:04:16 +0000 |
util.jid: Strip trailing '.' when normalizing hostnames
|
Matthew Wild |
Mon, 16 Dec 2013 02:03:35 +0000 |
mod_muc: Remove extra parenthesis (thanks janhouse)
|
Kim Alvefur |
Sat, 14 Dec 2013 17:25:17 +0100 |
Merge 0.10->trunk
|
Kim Alvefur |
Sat, 14 Dec 2013 17:25:55 +0100 |
mod_muc: Remove extra parenthesis (thanks janhouse)
|
Kim Alvefur |
Sat, 14 Dec 2013 17:25:17 +0100 |
Merge 0.10->trunk
|
Matthew Wild |
Fri, 13 Dec 2013 12:53:14 +0000 |
Merge 0.9->0.10
|
Matthew Wild |
Fri, 13 Dec 2013 12:52:39 +0000 |
mod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B)
|
Matthew Wild |
Fri, 13 Dec 2013 12:52:03 +0000 |
prosody: Store the config file name so the same file can be used when reloading
|
Kim Alvefur |
Fri, 13 Dec 2013 10:25:40 +0100 |
Merge 0.10->trunk
|
Matthew Wild |
Wed, 11 Dec 2013 22:32:17 +0000 |
Merge 0.9->0.10
|
Matthew Wild |
Wed, 11 Dec 2013 22:31:48 +0000 |
Tagging 0.9.2 (again)
|
Matthew Wild |
Wed, 04 Dec 2013 15:06:48 +0000 |
Makefile, configure: Add option for disabling generation of example certificates
0.9.2
|
Kim Alvefur |
Sat, 30 Nov 2013 22:26:20 +0100 |
Merge 0.10->trunk
|
Matthew Wild |
Fri, 29 Nov 2013 20:11:53 +0000 |
Merge 0.9->0.10
|
Matthew Wild |
Fri, 29 Nov 2013 20:11:06 +0000 |
Tagging 0.9.2
|
Matthew Wild |
Fri, 29 Nov 2013 20:10:13 +0000 |
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 28 Nov 2013 16:17:51 +0100 |
Merge 0.9->0.10
|
Kim Alvefur |
Thu, 28 Nov 2013 16:17:21 +0100 |
util.pposix: Verify that file handle is open
|
Kim Alvefur |
Thu, 28 Nov 2013 16:12:40 +0100 |
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 24 Nov 2013 14:24:53 +0100 |
Merge 0.9->0.10
|
Kim Alvefur |
Sun, 24 Nov 2013 14:24:21 +0100 |
Makefile, certs: Generate example certificates on build, remove the old static one
|
Kim Alvefur |
Fri, 22 Nov 2013 15:27:21 +0100 |
Merge 0.10->trunk
|
Matthew Wild |
Thu, 21 Nov 2013 02:15:36 +0000 |
Merge 0.9->0.10
|
Matthew Wild |
Thu, 21 Nov 2013 02:14:23 +0000 |
certmanager: Further cipher string tweaking. Re-enable ciphers required for DSA and ECDH certs/keys.
|
Matthew Wild |
Thu, 21 Nov 2013 02:11:09 +0000 |
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 13 Nov 2013 11:59:43 +0100 |
util.sql: Fix previous commit
|
Kim Alvefur |
Tue, 12 Nov 2013 11:38:52 +0100 |
util.sql: Get character set info from the correct database.
|
Kim Alvefur |
Tue, 12 Nov 2013 11:13:45 +0100 |
Merge 0.10->trunk
|
Matthew Wild |
Tue, 12 Nov 2013 02:23:29 +0000 |
Merge 0.9->0.10
|
Matthew Wild |
Tue, 12 Nov 2013 02:23:02 +0000 |
Back out 1b0ac7950129, as SSLv3 appears to still be in moderate use on the network. Also, although obsolete, SSLv3 isn't documented to have any weaknesses that TLS 1.0 (the most common version used today) doesn't also have. Get your act together clients!
|
Matthew Wild |
Tue, 12 Nov 2013 02:13:01 +0000 |
Merge 0.10->trunk
|
Kim Alvefur |
Mon, 11 Nov 2013 23:28:53 +0100 |
mod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=false
|
Kim Alvefur |
Mon, 11 Nov 2013 23:15:26 +0100 |
util.sql: Rewrite auto increment columns to SERIAL for PostgreSQL
|
Kim Alvefur |
Mon, 11 Nov 2013 23:09:18 +0100 |
Merge 0.10->trunk
|
Matthew Wild |
Sun, 10 Nov 2013 23:10:46 +0000 |
util.sql: Fix to call execute on 'self' rather than 'engine' (thanks eisensheng)
|
Matthew Wild |
Sun, 10 Nov 2013 23:10:27 +0000 |
Merge 0.10->trunk
|
Matthew Wild |
Sun, 10 Nov 2013 18:50:01 +0000 |
Merge 0.9->0.10
|
Matthew Wild |
Sun, 10 Nov 2013 18:49:34 +0000 |
certmanager: Update default cipher string to prefer forward-secrecy over cipher strength and to disable triple-DES (weaker and much slower than AES)
|
Matthew Wild |
Sun, 10 Nov 2013 18:46:48 +0000 |
util.set: Remove unused variable
|
Matthew Wild |
Sun, 10 Nov 2013 16:43:10 +0000 |
Merge 0.10->trunk
|
Matthew Wild |
Sat, 09 Nov 2013 18:37:13 +0000 |
Merge 0.9->0.10
|
Matthew Wild |
Sat, 09 Nov 2013 18:36:32 +0000 |
mod_storage_sql2: Fix backwards comparison of timestamp
|
Kim Alvefur |
Thu, 07 Nov 2013 17:18:20 +0100 |
certmanager: Fix order of options, so that the dynamic option is at the end of the array
|
Matthew Wild |
Sat, 09 Nov 2013 17:54:21 +0000 |
certmanager: Default to using the server's cipher preference order by default, as clients have been shown to commonly select weak and insecure ciphers even when they support stronger ones
|
Matthew Wild |
Sat, 09 Nov 2013 17:50:19 +0000 |
core.moduleapi: Fix some global accesses.
|
Waqas Hussain |
Wed, 06 Nov 2013 14:38:51 -0500 |
core/moduleapi: Return timer object from module:add_timer
|
daurnimator |
Wed, 06 Nov 2013 12:56:35 -0500 |
util/timer: Re-set params when timer is rescheduled
|
daurnimator |
Wed, 06 Nov 2013 12:56:18 -0500 |
Merge 0.10 -> trunk
|
Kim Alvefur |
Thu, 31 Oct 2013 20:49:03 +0100 |
Merge 0.9 -> 0.10
|
Kim Alvefur |
Thu, 31 Oct 2013 20:47:57 +0100 |
certmanager: Disable SSLv3 by default
|
Kim Alvefur |
Thu, 31 Oct 2013 19:00:36 +0100 |
mod_storage_sql2: Switch to the util.sql table definition for the main table
|
Kim Alvefur |
Thu, 31 Oct 2013 00:53:59 +0100 |
mod_storage_sql2: The prosodyarchive_index should be unique
|
Kim Alvefur |
Wed, 30 Oct 2013 22:37:07 +0100 |
mod_storage_sql2: Use primary_key and auto_increment flags instead of baking that into the type
|
Kim Alvefur |
Wed, 30 Oct 2013 22:27:22 +0100 |
mod_storage_sql2: Use MEDIUMTEXT fields for value columns (ie TEXT on non-MySQL)
|
Kim Alvefur |
Wed, 30 Oct 2013 14:33:15 +0100 |
util.sql: Rewrite MEDIUMTEXT to TEXT for drivers other than MySQL
|
Kim Alvefur |
Wed, 30 Oct 2013 10:24:35 +0100 |
util.sql: Check what encoding SQLite3 uses
|
Kim Alvefur |
Tue, 29 Oct 2013 11:43:49 +0100 |
util.sql: Find out if MySQL supports utf8mb4 and use that
|
Kim Alvefur |
Tue, 29 Oct 2013 11:42:55 +0100 |
util.sql: Support incrementing columns
|
Kim Alvefur |
Mon, 28 Oct 2013 23:20:25 +0100 |
util.sql: Allow columns to be marked the primary key
|
Kim Alvefur |
Mon, 28 Oct 2013 23:19:47 +0100 |
util.sql: Allow creating unique indices
|
Kim Alvefur |
Mon, 28 Oct 2013 23:18:54 +0100 |
mod_storage_sql2: Move checking of the sql_manage_tables option so it also includes table upgrades (again)
|
Kim Alvefur |
Mon, 28 Oct 2013 22:08:46 +0100 |
mod_storage_sql2, util.sql: Move code for setting encoding to util.sql
|
Kim Alvefur |
Mon, 28 Oct 2013 22:07:16 +0100 |
mod_storage_sql2: Move all schema upgrade code to the same place
|
Kim Alvefur |
Mon, 28 Oct 2013 21:37:30 +0100 |
mod_storage_sql2: Split up setting of encoding and table upgrade code
|
Kim Alvefur |
Mon, 28 Oct 2013 21:34:55 +0100 |
util.timer: Import all require upvalues.
|
Waqas Hussain |
Wed, 30 Oct 2013 17:58:17 -0400 |
util.timer: Fix another variable name typo (thanks again zash).
|
Waqas Hussain |
Wed, 30 Oct 2013 17:56:00 -0400 |
util.timer: Fix variable name typo.
|
Waqas Hussain |
Wed, 30 Oct 2013 17:51:37 -0400 |
util.timer: Updated to use util.indexedbheap to provide a more complete API. Timers can now be stopped or rescheduled. Callbacks are now pcall'd. Adding/removing timers from within timer callbacks works better. Optional parameter can be passed when creating timer which gets passed to callback, eliminating the need for closures in various timer uses. Timers are now much more lightweight.
|
Waqas Hussain |
Wed, 30 Oct 2013 17:44:42 -0400 |
util.indexedbheap: A priority queue implementation with a reverse index with no per-entry memory allocation.
|
Waqas Hussain |
Wed, 30 Oct 2013 17:30:35 -0400 |
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 15 Oct 2013 10:48:11 +0200 |
certmanager: Fix. Again.
|
Kim Alvefur |
Tue, 15 Oct 2013 10:47:34 +0200 |
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 15 Oct 2013 01:38:02 +0200 |
certmanager: Add back single_dh_use and single_ecdh_use to default options (Zash breaks, Zash unbreaks)
|
Kim Alvefur |
Tue, 15 Oct 2013 01:37:16 +0200 |
util.sasl.scram: Rename variable for clarity
|
Kim Alvefur |
Sun, 13 Oct 2013 01:43:04 +0200 |
util.sasl.scram: Cache profile name instead of concatenating when used
|
Kim Alvefur |
Sun, 13 Oct 2013 01:36:28 +0200 |
util.sasl.scram: Rewrite patterns and capture client-first-message-bare, client-final-message-without-proof
|
Kim Alvefur |
Sun, 13 Oct 2013 01:14:21 +0200 |
util.sasl.scram: Create the state table as late as possible, keep state in locals for faster access
|
Kim Alvefur |
Sun, 13 Oct 2013 00:29:47 +0200 |
util.sasl.scram: Compare gs2-header to cbind-input (Thanks Tobias)
|
Kim Alvefur |
Sat, 12 Oct 2013 21:15:36 +0200 |
Merge 0.10->trunk
|
Matthew Wild |
Thu, 10 Oct 2013 22:27:01 +0100 |
Merge 0.9->0.10
|
Matthew Wild |
Thu, 10 Oct 2013 22:26:41 +0100 |
util.windows: Incorrect output buffer size passed to ReadConsoleOutputAttribute (fixes issue#362, thanks yanjun).
|
Waqas Hussain |
Thu, 10 Oct 2013 17:18:16 -0400 |
util.sasl: Remove unused print() import.
|
Waqas Hussain |
Mon, 07 Oct 2013 18:02:58 -0400 |
util.sasl: Make registerMechanism a public function (again)
|
Waqas Hussain |
Mon, 07 Oct 2013 17:57:06 -0400 |
Merge 0.10->trunk
|
Kim Alvefur |
Mon, 07 Oct 2013 12:56:53 +0200 |
mod_saslauth: Collect data for channel binding only if we know for sure that the stream is encrypted
|
Kim Alvefur |
Mon, 07 Oct 2013 12:56:21 +0200 |
mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways mean encrypted (eg consider_bosh_secure)
|
Kim Alvefur |
Mon, 07 Oct 2013 12:43:00 +0200 |
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 06 Oct 2013 23:53:15 +0200 |
util.array: Improve array:reverse() and make it work as both method and non-mutating function
|
Kim Alvefur |
Sun, 06 Oct 2013 23:18:54 +0200 |
util.sasl.scram: Remove unused function and import
|
Kim Alvefur |
Sun, 06 Oct 2013 23:17:05 +0200 |
Merge 0.10->trunk
|
Matthew Wild |
Sat, 05 Oct 2013 12:16:28 -0400 |
Merge 0.9->0.10
|
Matthew Wild |
Sat, 05 Oct 2013 12:15:25 -0400 |
muc.lib.lua: Fix Spark jabber client not displaying conference room lists, seemingly due to a missing value tag for the room description if the description has not been set
|
Paul |
Sat, 05 Oct 2013 17:11:16 +0100 |