|
plugins/muc/muc.lib: Tidy up `get_filtered_presence`
|
daurnimator |
Wed, 19 Mar 2014 14:06:04 -0400 |
|
plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition.
|
daurnimator |
Wed, 19 Mar 2014 13:59:59 -0400 |
|
plugins/muc/muc.lib: Use module.host where `muc_domain` was previously
|
daurnimator |
Wed, 19 Mar 2014 13:57:02 -0400 |
|
plugins/muc/muc.lib: Remove unused methods (breaks api)
|
daurnimator |
Wed, 19 Mar 2014 13:56:14 -0400 |
|
plugins/muc/muc.lib: Use more modern stanza methods
|
daurnimator |
Wed, 19 Mar 2014 12:19:44 -0400 |
|
plugins/muc: Provide a reasonable default `route_stanza`
|
daurnimator |
Wed, 19 Mar 2014 12:03:15 -0400 |
|
plugins/muc/mod_muc: host sessions have a .send these days
|
daurnimator |
Tue, 18 Mar 2014 18:56:26 -0400 |
|
plugins/muc/mod_muc: Refactor to use new methods available
|
daurnimator |
Tue, 18 Mar 2014 18:55:52 -0400 |
|
plugins/muc/muc: Add 'muc-occupant-left' event
|
daurnimator |
Tue, 18 Mar 2014 18:52:28 -0400 |
|
plugins/muc/muc: Only call get_password once in invite creation
|
daurnimator |
Tue, 18 Mar 2014 16:01:53 -0400 |
|
plugins/muc/muc: When there's no history; return an empty iterator
|
daurnimator |
Tue, 18 Mar 2014 15:42:48 -0400 |
|
plugins/muc/muc: Support mediated declines
|
daurnimator |
Tue, 18 Mar 2014 15:15:28 -0400 |
|
plugins/muc/muc: Rename `handle_invite_to_room` to `handle_mediated_invite`; clean up logic
|
daurnimator |
Tue, 18 Mar 2014 15:15:14 -0400 |
|
plugins/muc/muc: Check for mediated invites in a smarter way
|
daurnimator |
Tue, 18 Mar 2014 14:56:20 -0400 |
|
plugins/muc/muc: Add copyright for daurnimator
|
daurnimator |
Tue, 18 Mar 2014 14:54:41 -0400 |
|
plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature
|
daurnimator |
Fri, 21 Feb 2014 19:06:33 -0500 |
|
plugins/muc/muc.lib: Move all kick code into one place
|
daurnimator |
Fri, 21 Feb 2014 18:04:38 -0500 |
|
plugins/muc/muc.lib: Make use of return values to send service-unavailable errors
|
daurnimator |
Fri, 21 Feb 2014 17:52:40 -0500 |
|
plugins/muc/muc.lib: Add some missing return values
|
daurnimator |
Fri, 21 Feb 2014 17:40:16 -0500 |
|
plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant`
|
daurnimator |
Fri, 21 Feb 2014 17:17:01 -0500 |
|
plugins/muc/muc.lib: Refactor _to_occupant handlers
|
daurnimator |
Fri, 21 Feb 2014 16:30:43 -0500 |
|
plugins/muc/muc.lib: Split out the room iq handler into functions
|
daurnimator |
Fri, 21 Feb 2014 15:48:26 -0500 |
|
plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions
|
daurnimator |
Thu, 20 Feb 2014 16:50:18 -0500 |
|
plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko)
|
daurnimator |
Thu, 20 Feb 2014 14:36:49 -0500 |
|
plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history`
|
daurnimator |
Wed, 19 Feb 2014 17:39:57 -0500 |
|
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
|
daurnimator |
Tue, 18 Feb 2014 17:21:47 -0500 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Mon, 21 Apr 2014 02:43:38 +0200 |
|
certmanager: Move ssl.protocol handling to after ssl.options is a table (thanks Ralph)
|
Kim Alvefur |
Mon, 21 Apr 2014 02:43:09 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 20 Apr 2014 23:39:45 +0200 |
|
certmanager: Fix traceback if no global 'ssl' section set (thanks albert)
|
Kim Alvefur |
Sun, 20 Apr 2014 21:25:26 +0200 |
|
mod_http: Update to disable peer verification with the new certmanager
|
Kim Alvefur |
Sat, 19 Apr 2014 21:59:53 +0200 |
|
mod_s2s: Replace open_stream() with function that only adds s2s/dialback attributes to stream header
|
Kim Alvefur |
Fri, 18 Apr 2014 07:51:41 +0200 |
|
util.xmppstream: Check for callback that may add stream header attributes
|
Kim Alvefur |
Fri, 18 Apr 2014 07:50:44 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 15 Apr 2014 21:54:44 +0200 |
|
net.http.server: Fix some typos introduced in 420c0d3b8583.
|
Daurnimator |
Tue, 15 Apr 2014 14:51:49 -0400 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 15 Apr 2014 20:36:39 +0200 |
|
certmanager: Update ssl_compression when config is reloaded
|
Kim Alvefur |
Tue, 15 Apr 2014 01:02:56 +0200 |
|
certmanager: Reformat core ssl defaults
|
Kim Alvefur |
Tue, 15 Apr 2014 00:49:17 +0200 |
|
certmanager: Support ssl.protocol syntax like "tlsv1+" that disables older protocols
|
Kim Alvefur |
Tue, 15 Apr 2014 00:45:07 +0200 |
|
certmanager: Merge ssl.options, verify etc from core defaults and global ssl settings with inheritance while allowing options to be disabled per virtualhost
|
Kim Alvefur |
Tue, 15 Apr 2014 00:32:11 +0200 |
|
certmanager: Wrap long line and add comment
|
Kim Alvefur |
Mon, 14 Apr 2014 23:41:26 +0200 |
|
certmanager: Concatenate cipher list if given as a table
|
Kim Alvefur |
Mon, 14 Apr 2014 23:34:35 +0200 |
|
certmanager: Allow non-server contexts to be without certificate and key
|
Kim Alvefur |
Mon, 14 Apr 2014 23:09:28 +0200 |
|
certmanager: Check for non-nil values instead of true-ish values, allows removing defaults
|
Kim Alvefur |
Mon, 14 Apr 2014 23:00:44 +0200 |
|
Merge 0.10->trunk
|
Matthew Wild |
Tue, 15 Apr 2014 18:08:16 +0100 |
|
net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API
|
Daurnimator |
Tue, 15 Apr 2014 18:07:45 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 10 Apr 2014 16:52:03 +0200 |
|
mod_s2s: Revert e626ee2fe106 change, it broke Dialback
|
Kim Alvefur |
Thu, 10 Apr 2014 16:49:59 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 10 Apr 2014 13:16:54 +0200 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Thu, 10 Apr 2014 13:15:11 +0200 |
|
prosody: Check dependencies later in the startup sequence
|
Kim Alvefur |
Wed, 09 Apr 2014 20:46:39 +0200 |
|
util.dependencies: Check for Lua 5.1. We don't currently support any other versions. LuaJIT identifies as 5.1.
|
Waqas Hussain |
Wed, 09 Apr 2014 14:01:02 -0400 |
|
mod_admin_telnet: muc:*: Fix nil index error when a room JID is passed with a non-existent host
|
Matthew Wild |
Sat, 05 Apr 2014 15:05:40 +0100 |
|
mod_c2s, mod_s2s, mod_component, util.xmppstream: Move all session:open_stream() functions to util.xmppstream
|
Kim Alvefur |
Thu, 10 Apr 2014 13:13:07 +0200 |
|
prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms
|
Kim Alvefur |
Thu, 10 Apr 2014 00:24:29 +0200 |
|
mod_posix: Remove compat code for 0.5
|
Kim Alvefur |
Thu, 10 Apr 2014 00:23:35 +0200 |
|
mod_storage_sql2: Build counter query without ORDER BY clause
|
Kim Alvefur |
Tue, 08 Apr 2014 19:23:11 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 03 Apr 2014 23:54:58 +0200 |
|
mod_compression: Only iterate over correctly named and namespaced child tags of compression feature
|
Kim Alvefur |
Thu, 03 Apr 2014 23:48:12 +0200 |
|
mod_compression: Use get_child() and get_child_text()
|
Kim Alvefur |
Thu, 03 Apr 2014 23:40:20 +0200 |
|
mod_compression: Remove checks for impossible conditions
|
Kim Alvefur |
Thu, 03 Apr 2014 23:33:38 +0200 |
|
Merge 0.10->trunk
|
Matthew Wild |
Wed, 02 Apr 2014 17:42:22 +0100 |
|
Merge 0.9->0.10
|
Matthew Wild |
Wed, 02 Apr 2014 17:41:38 +0100 |
|
util.xmppstream: Also disable CharacterData merging after stream restarts
|
Matthew Wild |
Wed, 02 Apr 2014 14:31:19 +0100 |
|
util.xmppstream: Disable LuaExpat's buffering (if possible)
|
Matthew Wild |
Wed, 02 Apr 2014 11:05:41 +0100 |
|
Tagging 0.9.4
|
Matthew Wild |
Tue, 01 Apr 2014 16:50:15 +0100 |
|
Merge
0.9.4
|
Matthew Wild |
Tue, 01 Apr 2014 16:03:21 +0100 |
|
MUC: Fixed traceback when a JID not in a room requested a role change for an occupant.
|
Waqas Hussain |
Tue, 01 Apr 2014 10:02:58 -0400 |
|
Merge
|
Matthew Wild |
Tue, 01 Apr 2014 15:02:36 +0100 |
|
net.server_{select,event}: Add compat code for supporting the same client port API on connections
|
Kim Alvefur |
Tue, 01 Apr 2014 15:26:40 +0200 |
|
Backed out changeset a5b5bce71a11
|
Kim Alvefur |
Mon, 31 Mar 2014 19:38:06 +0200 |
|
net.server_event: Rename conn:port() -> conn:clientport() to match server_select
|
Kim Alvefur |
Thu, 27 Mar 2014 23:02:52 +0100 |
|
Makefile: Change sed regex to be compatible with FreeBSD's odd sed, and change / to | to allow paths to be used in RUNWITH (thanks Ben)
|
Matthew Wild |
Sun, 30 Mar 2014 09:16:27 +0100 |
|
util.dependencies: Log error when LuaExpat is not capable of enforcing stanza size limits
|
Matthew Wild |
Sun, 30 Mar 2014 09:15:28 +0100 |
|
util.xmppstream: Implement stanza size limiting, default limit 10MB
|
Matthew Wild |
Sun, 30 Mar 2014 09:14:39 +0100 |
|
portmanager: Make maximum read size configurable, and default to 4KB
|
Matthew Wild |
Sun, 30 Mar 2014 08:44:55 +0100 |
|
mod_compression: Only allow compression on authenticated streams
|
Kim Alvefur |
Tue, 18 Feb 2014 20:03:12 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 25 Mar 2014 19:18:32 +0100 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Tue, 25 Mar 2014 19:16:38 +0100 |
|
prosody.cfg.lua.dist: mod_posix is enabled by default on posix platforms now
|
Kim Alvefur |
Sat, 22 Mar 2014 14:53:17 +0100 |
|
util.sasl: Fix logic for when mechanisms with channel binding support are offered
|
Kim Alvefur |
Sat, 22 Mar 2014 14:45:04 +0100 |
|
prosodyctl: Show real error if certificate config file can't be opened
|
Kim Alvefur |
Sat, 22 Mar 2014 12:02:11 +0100 |
|
modulemanager: Load mod_saslauth on components by default
|
Kim Alvefur |
Sat, 22 Mar 2014 12:42:01 +0100 |
|
mod_saslauth: Only do c2s SASL on normal VirtualHosts
|
Kim Alvefur |
Sat, 22 Mar 2014 12:41:38 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 09 Mar 2014 23:48:32 +0100 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Sun, 09 Mar 2014 23:47:53 +0100 |
|
mod_http_files: Strip path separator from end of paths, was broken on Windows (thanks Junne)
|
Kim Alvefur |
Sun, 09 Mar 2014 22:16:44 +0100 |
|
util.pluginloader: Always use path separator from package.config (thanks Junne)
|
Kim Alvefur |
Sun, 09 Mar 2014 22:15:40 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 26 Feb 2014 22:22:43 +0100 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Wed, 26 Feb 2014 22:21:55 +0100 |
|
mod_http: Fix http_external_url setting without an explicit port
|
Kim Alvefur |
Wed, 26 Feb 2014 22:19:58 +0100 |
|
mod_http: Use hostname from the correct context (thanks gryffus)
|
Kim Alvefur |
Thu, 20 Feb 2014 19:08:55 +0100 |
|
tools/ejabberd2prosody: Don't throw an error if XML CDATA is null ([] in Erlang, instead of a string or being missing).
|
Waqas Hussain |
Tue, 18 Feb 2014 16:03:13 -0500 |
|
mod_auth_anonymous: Fixed a traceback in listing all users (issue#396).
|
Waqas Hussain |
Mon, 17 Feb 2014 16:00:41 -0500 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 19 Feb 2014 23:45:24 +0100 |
|
mod_proxy65: Use mod_disco
|
Florian Zeitz |
Wed, 19 Feb 2014 20:13:35 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 19 Feb 2014 20:10:23 +0100 |
|
mod_auth_interal_hashed: Update salt and iteration count when setting a new password
|
Florian Zeitz |
Wed, 12 Feb 2014 13:45:16 +0100 |
|
Merge 0.10 -> trunk
|
Kim Alvefur |
Wed, 12 Feb 2014 19:26:54 +0100 |
|
Merge 0.9 -> 0.10
|
Kim Alvefur |
Wed, 12 Feb 2014 19:26:22 +0100 |
|
mod_admin_telnet: Prep jids for user:create() etc.
|
Kim Alvefur |
Sun, 09 Feb 2014 15:17:01 +0100 |
|
mod_s2s: Log a warning if no local addresses are found, as this breaks s2sout
|
Kim Alvefur |
Sun, 09 Feb 2014 15:13:46 +0100 |
|
mod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392)
|
Kim Alvefur |
Wed, 12 Feb 2014 19:25:15 +0100 |
|
mod_storage_sql2: archive:delete() with username = true deletes for all users
|
Kim Alvefur |
Sun, 09 Feb 2014 15:12:13 +0100 |
|
mod_ping: Use type-specific event
|
Kim Alvefur |
Sun, 09 Feb 2014 15:09:12 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 06 Feb 2014 10:55:09 +0100 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Thu, 06 Feb 2014 10:48:41 +0100 |
|
mod_motd: Strip indentation only, leave multiple newlines
|
Kim Alvefur |
Thu, 06 Feb 2014 10:44:21 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Mon, 03 Feb 2014 07:25:05 +0100 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Mon, 03 Feb 2014 07:23:33 +0100 |
|
tools/ejabberd2prosody: Handle new room member format.
|
Kim Alvefur |
Mon, 27 Jan 2014 16:47:54 +0100 |
|
mod_c2s: Break out stream opening into a separate function
|
Florian Zeitz |
Fri, 31 Jan 2014 12:01:12 +0100 |
|
MUC: Tag PMs with <x>, like presence stanzas
|
Kim Alvefur |
Tue, 28 Jan 2014 19:21:21 +0100 |
|
modulemanager: Always load a platform-specific module, add stub modules for Windows and unknown platforms
|
Kim Alvefur |
Sun, 26 Jan 2014 21:16:24 +0100 |
|
mod_posix: Daemonize by default only when installed
|
Kim Alvefur |
Sun, 26 Jan 2014 18:35:03 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Tue, 21 Jan 2014 03:26:04 +0000 |
|
Merge 0.9->0.10
|
Matthew Wild |
Tue, 21 Jan 2014 03:24:40 +0000 |
|
tools/ejabberd2prosody: Disable generating a config, as the format it generates is completely out of date.
|
Waqas Hussain |
Sat, 18 Jan 2014 17:26:02 -0500 |
|
tools/ejabberd2prosody: “xmlelement” can be “xmlel” in newer ejabberd (thanks cr).
|
Waqas Hussain |
Sat, 18 Jan 2014 17:24:10 -0500 |
|
MUC: Fire muc-room-destroyed event when the last participant leaves a non-persistent room
|
Kim Alvefur |
Sat, 18 Jan 2014 20:14:05 +0100 |
|
mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given
|
Kim Alvefur |
Tue, 21 Jan 2014 01:51:13 +0100 |
|
mod_storage_sql2: Fix another SQL syntax error that slipped trough
|
Kim Alvefur |
Tue, 21 Jan 2014 00:51:31 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Sat, 18 Jan 2014 18:46:31 +0000 |
|
Merge 0.9->0.10
|
Matthew Wild |
Sat, 18 Jan 2014 18:46:12 +0000 |
|
tools/ejabberd2prosody: Add support for importing MUC rooms.
|
Waqas Hussain |
Sat, 18 Jan 2014 10:37:12 -0500 |
|
tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors.
|
Waqas Hussain |
Thu, 16 Jan 2014 14:03:27 -0500 |
|
additional fix for erlparse loading in ejabberd2prosody.lua
|
Vadim Misbakh-Soloviov |
Fri, 14 Jun 2013 15:43:35 +0700 |
|
package{,c}path fixes for migration tools
|
Vadim Misbakh-Soloviov |
Fri, 14 Jun 2013 15:15:05 +0700 |
|
mod_tls: Let s2s_secure_auth override s2s_require_encryption and warn if they differ
|
Kim Alvefur |
Wed, 15 Jan 2014 22:47:50 +0100 |
|
mod_tls: Rename variables to be less confusing
|
Kim Alvefur |
Wed, 15 Jan 2014 21:57:15 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Sat, 18 Jan 2014 18:44:58 +0000 |
|
mod_storage_sql2: Fix SQL syntax
|
Kim Alvefur |
Sat, 18 Jan 2014 19:33:33 +0100 |
|
MUC: Expose room metatable on module
|
Kim Alvefur |
Sat, 18 Jan 2014 18:28:50 +0100 |
|
MUC: Split out sending of the topic into method separate from sending history
|
Kim Alvefur |
Sat, 18 Jan 2014 18:11:13 +0100 |
|
MUC: Split saving to history into a separate method
|
Kim Alvefur |
Sat, 18 Jan 2014 18:05:42 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Sun, 12 Jan 2014 06:27:55 -0500 |
|
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 |
|
mod_pep_plus: An util.pubsub based PEP module
|
Florian Zeitz |
Fri, 04 Oct 2013 18:42:44 +0200 |
|
mod_pubsub, util.pubsub: Keep track of the order of items
|
Kim Alvefur |
Fri, 04 Oct 2013 16:40:27 +0200 |
|
Merge 0.9->0.10
|
Matthew Wild |
Mon, 30 Sep 2013 23:46:38 +0100 |
|
util.filters: Fix inserting items so that higher priority filters run first
|
Kim Alvefur |
Mon, 30 Sep 2013 21:51:42 +0200 |
|
mod_storage_sql2: Add method for deleting items from archives with same syntax as :find()
|
Kim Alvefur |
Sat, 28 Sep 2013 22:04:04 +0200 |
|
mod_storage_sql2: Split out code for building WHERE clauses into separate functions
|
Kim Alvefur |
Sat, 28 Sep 2013 21:58:01 +0200 |
|
server_select: fix onreadtimeout support so that listeners can override the default (disconnect) behaviour
|
Matthew Wild |
Sat, 28 Sep 2013 18:40:48 +0100 |
|
util.x509: Only compare identity with oid-on-xmppAddr for XMPP services
|
Kim Alvefur |
Thu, 26 Sep 2013 16:55:39 +0200 |
|
util.sasl.scram: Simplify validation of client-first-message
|
Kim Alvefur |
Sun, 22 Sep 2013 04:29:27 +0200 |
|
Merge Tobias SCRAM-PLUS work
|
Kim Alvefur |
Sun, 22 Sep 2013 00:44:20 +0200 |
|
Backout ae48bf828f21
|
Kim Alvefur |
Sun, 22 Sep 2013 00:37:04 +0200 |
|
Only advertise mechanisms needing channel binding if a channel binding backend is avaliable.
|
Tobias Markmann |
Mon, 07 Feb 2011 13:24:42 +0100 |
|
sasl.util.scarm: Rearrage some code so it makes more sense.
|
Tobias Markmann |
Sun, 06 Feb 2011 13:39:32 +0100 |
|
util.sasl.scram: Checking the GS2 header for valid start flag.
|
Tobias Markmann |
Sun, 06 Feb 2011 13:20:17 +0100 |
|
mod_saslauth: Check whether LuaSec supports getpeerfinished() binding.
|
Tobias Markmann |
Mon, 17 Jan 2011 16:50:21 +0100 |
|
util.sasl.scram: Remove some debugging output.
|
Tobias Markmann |
Mon, 17 Jan 2011 16:50:21 +0100 |
|
util.sasl.scram: Adding reference to RFC 5929 'Channel Bindings for TLS'.
|
Tobias Markmann |
Mon, 17 Jan 2011 16:50:21 +0100 |
|
util.sasl.scram: Validate channel binding data of client final message.
|
Tobias Markmann |
Mon, 17 Jan 2011 16:50:21 +0100 |
|
mod_saslauth: Add channel binding handler for tls-unique channel binding.
|
Tobias Markmann |
Mon, 17 Jan 2011 16:50:21 +0100 |
|
util.sasl.scram: Use self.profile.cb for detection whether channel binding is supported or not.
|
Tobias Markmann |
Mon, 17 Jan 2011 16:50:21 +0100 |
|
mod_saslauth: Set secure socket as SASL object user data for secure sessions.
|
Tobias Markmann |
Mon, 17 Jan 2011 16:50:21 +0100 |
|
util.sasl: New method to add channel binding handler to a SASL instance.
|
Tobias Markmann |
Mon, 17 Jan 2011 16:50:21 +0100 |
|
Run with own LuaSec.
|
Tobias Markmann |
Mon, 17 Jan 2011 16:50:21 +0100 |
|
Check whether we support the proposed channel binding type.
|
Tobias Markmann |
Sat, 15 Jan 2011 17:59:15 +0100 |
|
Adding some code for channel binding advertising.
|
Tobias Markmann |
Wed, 12 Jan 2011 21:29:37 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Mon, 16 Sep 2013 18:41:30 +0100 |
|
Tagging 0.9.1
|
Matthew Wild |
Mon, 09 Sep 2013 11:32:03 +0100 |
|
moduleapi: Add module:unhook()
|
Matthew Wild |
Mon, 16 Sep 2013 18:41:09 +0100 |
|
net.server_select: Return handler from addclient
|
Kim Alvefur |
Fri, 06 Sep 2013 10:53:04 +0200 |
|
net.server_select: Pass on all arguments to addclient on to wrapclient
|
Kim Alvefur |
Fri, 06 Sep 2013 10:52:37 +0200 |
|
certmanager: Allow for specifying the dhparam option as a path to a file instead of a callback
|
Kim Alvefur |
Tue, 03 Sep 2013 15:43:59 +0200 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Tue, 03 Sep 2013 13:43:39 +0200 |
|
certmanager: Fix dhparam callback, missing imports (Testing, pfft)
0.9.1
|
Kim Alvefur |
Tue, 03 Sep 2013 13:40:29 +0200 |
|
Merge 0.9->trunk
|
Matthew Wild |
Tue, 03 Sep 2013 12:32:18 +0100 |
|
mod_admin_adhoc: As the only user of set:items(), update... it's now an iterator, and the extra keys() iterator is now unnecessary
|
Matthew Wild |
Tue, 03 Sep 2013 12:22:22 +0100 |
|
util.set: :items() now returns an iterator instead of the underlying table. This is much more efficient than 'for item in set' (which still works for now). Current access to _items is generally done directly, this may change.
|
Matthew Wild |
Tue, 03 Sep 2013 12:21:43 +0100 |
|
certmanager: Allow for specifying the dhparam option as a path to a file instead of a callback
|
Kim Alvefur |
Tue, 03 Sep 2013 13:13:31 +0200 |
|
certmanager: Fix for working around a bug with LuaSec 0.4.1 that causes it to not honour the 'ciphers' option. This change will apply 0.9's default cipher string for LuaSec 0.4.1 users.
|
Matthew Wild |
Tue, 03 Sep 2013 12:11:11 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Tue, 03 Sep 2013 00:20:28 +0100 |
|
util.set: Fix :include() and :exclude() methods to iterate the input set correctly
|
Matthew Wild |
Mon, 02 Sep 2013 20:52:19 +0100 |
|
util.pposix: Fix building on non-Linux with glibc
|
Kim Alvefur |
Mon, 02 Sep 2013 18:19:38 +0200 |
|
configmanager: Fix checking of absolute paths on Windows
|
Kim Alvefur |
Fri, 30 Aug 2013 18:51:55 +0200 |
|
util.net: Fix s2sout on Windows (return 0.0.0.0 and :: instead of an empty list)
|
Kim Alvefur |
Fri, 30 Aug 2013 16:14:31 +0200 |
|
prosodyctl: check: Support for unicode (IDN) domains (thanks once again albert)
|
Matthew Wild |
Mon, 02 Sep 2013 15:22:41 +0100 |
|
mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true)
|
Matthew Wild |
Fri, 30 Aug 2013 14:15:29 +0100 |
|
mod_muc: Import util.array
|
Matthew Wild |
Fri, 30 Aug 2013 14:10:51 +0100 |
|
prosody.cfg.lua.dist: Set c2s_require_encryption = true
|
Matthew Wild |
Thu, 29 Aug 2013 11:59:27 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Sat, 24 Aug 2013 23:16:08 +0100 |
|
mod_pep: Update COMPAT comment, it seems Asterisk 1.8 also suffers from this issue (thanks Lonnie Abelbeck)
|
Matthew Wild |
Sat, 24 Aug 2013 23:15:24 +0100 |
|
Added tag 0.9.0 for changeset 6ef79af0c445
|
Matthew Wild |
Mon, 19 Aug 2013 20:36:04 +0100 |
|
mod_c2s: Move another log message to debug level
|
Kim Alvefur |
Wed, 14 Aug 2013 15:38:56 +0200 |
|
mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully) less confusing way
|
Kim Alvefur |
Wed, 14 Aug 2013 15:00:36 +0200 |
|
mod_s2s: Captitalize log messages that begin with a stream direction
|
Kim Alvefur |
Wed, 14 Aug 2013 14:53:50 +0200 |
|
mod_s2s: Lower "Beginning new connection attempt" message from info to debug level
|
Kim Alvefur |
Wed, 14 Aug 2013 14:44:56 +0200 |
|
mod_s2s/s2sout.lib: Improve error message logged at 'info' level when failing to connect to a host. Now 'Failed in all attempts to connect to XYZ'
|
Matthew Wild |
Wed, 14 Aug 2013 00:18:39 +0100 |
|
util.async: Make guarder() local
|
Matthew Wild |
Tue, 13 Aug 2013 23:38:50 +0100 |
|
util.async: Add guarder method, to create guards to ensure only a single runner can pass through a section of code at a time
|
Matthew Wild |
Tue, 13 Aug 2013 21:26:53 +0100 |
|
usermanager: Remove unused import of pairs()
|
Matthew Wild |
Tue, 13 Aug 2013 19:38:05 +0100 |
|
util.async: Fix logic bug that prevented error watcher being called for runners
|
Matthew Wild |
Tue, 13 Aug 2013 19:23:00 +0100 |
|
util.async: waiter: Throw error if done() called too many times
|
Kim Alvefur |
Mon, 12 Aug 2013 13:22:27 +0200 |
|
util.async: waiter: Remove restriction about wait() being called before done()
|
Matthew Wild |
Mon, 12 Aug 2013 12:08:51 +0100 |
|
util.async: runner: Fix check for new state to recognise transition to 'waiting'
|
Matthew Wild |
Mon, 12 Aug 2013 11:50:27 +0100 |
|
util.async: Make functions local
|
Matthew Wild |
Mon, 12 Aug 2013 10:27:08 +0100 |
|
mod_c2s: Port coroutine code to util.async
|
Matthew Wild |
Sun, 11 Aug 2013 14:46:27 +0100 |
|
util.async: New library to provide support around coroutine-based non-blocking functions
|
Matthew Wild |
Sun, 11 Aug 2013 14:46:07 +0100 |
|
util.debug: Fix level of locals when inspecting a coroutine
|
Matthew Wild |
Sun, 11 Aug 2013 10:42:58 +0100 |
|
util.debug: Further fix to display locals in extended tracebacks
|
Matthew Wild |
Sat, 10 Aug 2013 20:40:45 +0100 |
|
util.debug: Fixes to make coroutine tracebacks work properly
|
Matthew Wild |
Sat, 10 Aug 2013 20:30:40 +0100 |
|
mod_auth_internal_hashed: Log calls to provider methods and be consistent with mod_auth_internal_plain
|
Kim Alvefur |
Sat, 10 Aug 2013 20:19:40 +0200 |
|
mod_auth_internal_hashed: Use logger setup by moduleapi instead of going for util.logger directly
|
Kim Alvefur |
Sat, 10 Aug 2013 20:17:45 +0200 |
|
mod_auth_internal_hashed: Remove this 'initializing' message too
|
Kim Alvefur |
Sat, 10 Aug 2013 20:15:25 +0200 |
|
mod_auth_internal_plain: Remove "initializing" log message, hostmanager logs this too
|
Kim Alvefur |
Sat, 10 Aug 2013 20:10:30 +0200 |
|
mod_auth_internal_plain: Log a debug message when changing password to be consistent with the other methods
|
Kim Alvefur |
Sat, 10 Aug 2013 20:09:33 +0200 |
|
mod_auth_internal_plain: Remove redundant hostname from log messages
|
Kim Alvefur |
Sat, 10 Aug 2013 20:06:51 +0200 |
|
mod_dialback: Change level of some log statements to be more appropriate
|
Kim Alvefur |
Sat, 10 Aug 2013 19:53:22 +0200 |
|
util.pposix: Fix overflow in rlimit argument conversion (thanks gcc, now be quiet please)
|
Kim Alvefur |
Sat, 10 Aug 2013 19:02:52 +0200 |
|
Remove all trailing whitespace
|
Florian Zeitz |
Fri, 09 Aug 2013 17:48:21 +0200 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Fri, 09 Aug 2013 16:03:48 +0200 |
|
util.hashes: Silence compiler warning about pointer signedness
0.9.0
|
Kim Alvefur |
Fri, 09 Aug 2013 16:03:17 +0200 |
|
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.
|
Matthew Wild |
Fri, 09 Aug 2013 11:10:22 +0100 |
|
mod_disco: Check for host type == 'local' ('normal' never existed)
|
Matthew Wild |
Tue, 06 Aug 2013 17:18:39 +0100 |
|
moduleapi: module:get_host_type() now returns 'global' for * and 'local' for non-components
|
Matthew Wild |
Tue, 06 Aug 2013 17:17:23 +0100 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Tue, 06 Aug 2013 14:35:03 +0200 |
|
mod_admin_telnet, mod_s2s: Fix reporting of certificate chain validation details
|
Kim Alvefur |
Tue, 06 Aug 2013 14:32:31 +0200 |
|
util.hashes: Correct argument order
|
Kim Alvefur |
Tue, 06 Aug 2013 14:31:20 +0200 |
|
mod_s2s: Improve policy check
|
Kim Alvefur |
Mon, 05 Aug 2013 20:47:38 +0200 |
|
mod_s2s: Log certificate identity validation result
|
Kim Alvefur |
Sun, 04 Aug 2013 17:33:00 +0200 |
|
mod_storage_sql2: Do an early return and drop an indentation level
|
Kim Alvefur |
Fri, 02 Aug 2013 15:40:21 +0200 |
|
mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details
|
Kim Alvefur |
Fri, 02 Aug 2013 15:12:24 +0200 |
|
mod_register: Use more specific get_option variants
|
Kim Alvefur |
Fri, 02 Aug 2013 14:44:56 +0200 |
|
mod_adhoc: Add local_user permission
|
Florian Zeitz |
Wed, 24 Jul 2013 23:30:32 +0200 |
|
mod_adhoc: Use mod_disco for disco handling
|
Florian Zeitz |
Wed, 24 Jul 2013 22:58:44 +0200 |
|
mod_adhoc: Sort commands by node. This guarantees the order remains the same across restarts etc.
|
Florian Zeitz |
Wed, 24 Jul 2013 22:08:07 +0200 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Wed, 24 Jul 2013 21:50:38 +0200 |
|
adhoc.lib: Don't build error reply from reply stanza
|
Kim Alvefur |
Wed, 24 Jul 2013 21:49:36 +0200 |
|
mod_c2s: Change default of tcp_keepalives to true, and make it individually configurable through c2s_tcp_keepalives
|
Kim Alvefur |
Wed, 24 Jul 2013 15:28:36 +0200 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Mon, 22 Jul 2013 20:29:41 +0200 |
|
net.server_event: Pass ondrain handler from listener
|
Kim Alvefur |
Mon, 22 Jul 2013 18:17:30 +0200 |
|
net.http.server: Fix Keep-Alive requests with HTTP 1.0
|
Kim Alvefur |
Mon, 22 Jul 2013 17:28:37 +0200 |
|
Merge 0.9->trunk
|
Matthew Wild |
Mon, 15 Jul 2013 23:43:37 +0100 |
|
util.net: Fix compilation on Windows (outputs an empty list of addresses for now) (tested only in my head)
|
Matthew Wild |
Mon, 15 Jul 2013 23:43:20 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Mon, 15 Jul 2013 23:35:49 +0100 |
|
util.net: Include missing header needed for successful compiltion on FreeBSD
|
Matthew Wild |
Mon, 15 Jul 2013 23:34:59 +0100 |
|
util.events: Remove varargs, event handlers can now only accept a single parameter
|
Matthew Wild |
Mon, 15 Jul 2013 12:15:51 +0100 |
|
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)
|
Matthew Wild |
Mon, 15 Jul 2013 11:44:49 +0100 |
|
rostermanager, mod_groups: Change roster-load event to pass an event table for consistency
|
Matthew Wild |
Mon, 15 Jul 2013 11:43:23 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Sat, 13 Jul 2013 13:17:53 +0100 |
|
certmanager: Set our own default cipher string, which includes only ciphers regarded as 'HIGH' strength (by OpenSSL). In particular this disables RC4.
|
Matthew Wild |
Sat, 13 Jul 2013 13:15:24 +0100 |
|
util.sql: Do lazy fetching of affected/rowcount
|
Kim Alvefur |
Fri, 12 Jul 2013 17:44:30 +0200 |
|
Backed out changeset 3c57c2281087
|
Kim Alvefur |
Fri, 12 Jul 2013 17:41:54 +0200 |
|
util.sql: Don't fetch row count of result sets for queries that don't have result sets
|
Kim Alvefur |
Fri, 12 Jul 2013 17:03:09 +0200 |
|
mod_storage_sql2: Add archive store with append and find methods
|
Kim Alvefur |
Fri, 12 Jul 2013 02:53:24 +0200 |
|
mod_storage_sql2: Create an additional table `prosodyarchive` for chronological collections
|
Kim Alvefur |
Fri, 12 Jul 2013 01:34:38 +0200 |
|
util.sql: Set charset and collation for MySQL when creating tables
|
Kim Alvefur |
Thu, 11 Jul 2013 22:07:55 +0200 |
|
Remove plugins/storage/sqlbasic.lib.lua, which seems obsolete
|
Matthew Wild |
Thu, 11 Jul 2013 15:13:45 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Thu, 11 Jul 2013 15:10:04 +0100 |
|
mod_storage_sql2: Remove from 0.9
|
Matthew Wild |
Thu, 11 Jul 2013 15:08:47 +0100 |
|
mod_storage_sql2: Support XML serialization for stanzas.
|
Kim Alvefur |
Wed, 10 Jul 2013 13:19:33 +0200 |
|
mod_storage_sql2: Keep available store types in a table
|
Kim Alvefur |
Wed, 10 Jul 2013 13:18:10 +0200 |
|
mod_storage_sql2: Fix iteration over users and stores
|
Kim Alvefur |
Wed, 10 Jul 2013 12:08:44 +0200 |
|
mod_storage_sql2: Make sure the user field is not NULL
|
Kim Alvefur |
Wed, 10 Jul 2013 12:01:23 +0200 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Wed, 10 Jul 2013 07:47:54 +0200 |
|
net.dns, net.adns: Make sure errors from net.server are propagated (thanks asterix)
|
Kim Alvefur |
Wed, 10 Jul 2013 07:45:10 +0200 |
|
Merge 0.9->trunk
|
Matthew Wild |
Tue, 09 Jul 2013 00:04:30 +0100 |
|
mod_component: Local imports for some functions, including xpcall
|
Matthew Wild |
Mon, 08 Jul 2013 23:59:51 +0100 |
|
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).
|
Matthew Wild |
Mon, 08 Jul 2013 23:59:27 +0100 |
|
mod_bosh: Only pass stanza to core_process_stanza if it wasn't dropped by filters
|
Matthew Wild |
Mon, 08 Jul 2013 23:42:54 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Mon, 08 Jul 2013 21:41:31 +0100 |
|
mod_component: xpcall() stanza processing, as per other listeners, preventing potentially harmful 'top-level errors'
|
Matthew Wild |
Mon, 08 Jul 2013 21:38:08 +0100 |
|
prosodyctl: Import local_addresses from the new util.net intead of luasocket
|
Kim Alvefur |
Mon, 01 Jul 2013 22:17:31 +0200 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Sat, 29 Jun 2013 22:49:56 +0200 |
|
mod_admin_adhoc: Fix node of the "Get List of Online Users" command
|
Florian Zeitz |
Sat, 29 Jun 2013 22:40:10 +0200 |
|
Merge
|
Matthew Wild |
Sat, 29 Jun 2013 14:45:47 +0100 |
|
util.pposix: Correctly handle 'unlimited' limits (RLIM_INFINITY), by returning and accepting the string 'unlimited' in get/setrlimit()
|
Matthew Wild |
Sat, 29 Jun 2013 14:45:38 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Sat, 29 Jun 2013 10:11:55 +0100 |
|
util.pposix: setrlimit(): Add missing return on error when an incorrect number of arguments are passed
|
Matthew Wild |
Fri, 28 Jun 2013 20:16:43 +0100 |
|
mod_http_files: Put the MIME type map in a global shared table instead of per-host
|
Kim Alvefur |
Fri, 28 Jun 2013 19:34:57 +0200 |
|
Merge 0.9->trunk
|
Matthew Wild |
Wed, 26 Jun 2013 21:40:33 +0100 |
|
net.http: Include port number (when non-standard) in the Host header of outgoing requests, as per the HTTP RFC
|
Matthew Wild |
Wed, 26 Jun 2013 21:40:01 +0100 |
|
mod_s2s: Add missing global hook for read-timeout
|
Kim Alvefur |
Wed, 26 Jun 2013 13:35:38 +0200 |
|
Merge 0.9->trunk
|
Matthew Wild |
Mon, 24 Jun 2013 18:29:04 +0100 |
|
mod_storage_sql2: Use correct variable (Thanks SkyBlue and Florob)
|
Kim Alvefur |
Sun, 23 Jun 2013 19:27:49 +0200 |
|
mod_admin_telnet: Refactor s2s:show()
|
Kim Alvefur |
Thu, 20 Jun 2013 21:47:38 +0200 |
|
mod_admin_telnet: Generate session names the same way as in s2smanager
|
Kim Alvefur |
Thu, 20 Jun 2013 21:47:28 +0200 |
|
mod_admin_telnet: Refactor s2s:close and s2s:closeall
|
Kim Alvefur |
Thu, 20 Jun 2013 20:53:29 +0200 |
|
mod_register: Fix indentation
|
Kim Alvefur |
Wed, 19 Jun 2013 16:35:19 +0200 |
|
mod_admin_telnet: Refactor s2s:showcert()
|
Kim Alvefur |
Wed, 19 Jun 2013 16:20:33 +0200 |
|
net.dns: Support IPv6 addresses in resolv.conf
|
Florian Zeitz |
Tue, 18 Jun 2013 23:02:20 +0200 |
|
Merge 0.9->trunk
|
Matthew Wild |
Tue, 18 Jun 2013 12:17:06 +0100 |
|
mod_s2s/s2sout.lib: Remove unused variables and imports
|
Matthew Wild |
Tue, 18 Jun 2013 12:14:46 +0100 |
|
mod_s2s/s2sout.lib: Remove reference to undefined global
|
Matthew Wild |
Tue, 18 Jun 2013 12:12:49 +0100 |
|
mod_s2s/s2sout.lib: Use new util.net.local_addresses() to fetch local interface addresses
|
Matthew Wild |
Tue, 18 Jun 2013 12:12:12 +0100 |
|
mod_s2s/s2sout.lib: Only attempt to create an IPv6 socket if LuaSocket supports IPv6
|
Matthew Wild |
Tue, 18 Jun 2013 12:11:40 +0100 |
|
util.net: Add util.net, containing local_addresses() (removed from LuaSocket 3.0)
|
Matthew Wild |
Tue, 18 Jun 2013 09:04:44 +0100 |
|
mod_tls: Remove debug statement
|
Kim Alvefur |
Sun, 16 Jun 2013 15:01:31 +0200 |
|
additional fix for erlparse loading in ejabberd2prosody.lua
|
Vadim Misbakh-Soloviov |
Fri, 14 Jun 2013 15:43:35 +0700 |
|
package{,c}path fixes for migration tools
|
Vadim Misbakh-Soloviov |
Fri, 14 Jun 2013 15:15:05 +0700 |
|
Merge the merge
|
Matthew Wild |
Thu, 13 Jun 2013 23:24:36 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Thu, 13 Jun 2013 23:21:24 +0100 |
|
util.dataforms: Return nil for empty list-mutli responses, to be consistent with other readers
|
Florian Zeitz |
Fri, 14 Jun 2013 00:07:57 +0200 |
|
mod_muc: Add Ad-Hoc command to destroy MUC rooms
|
Florian Zeitz |
Wed, 05 Jun 2013 00:05:03 +0200 |
|
mod_muc: Utilize mod_disco, instead of reimplementing disco handling
|
Florian Zeitz |
Wed, 05 Jun 2013 00:04:44 +0200 |
|
mod_pubsub: Utilize mod_disco, instead of reimplementing disco handling
|
Florian Zeitz |
Wed, 05 Jun 2013 00:01:17 +0200 |
|
mod_disco: Allow ansering disco requests including nodes, and adding custom items to disco#items requests
|
Florian Zeitz |
Tue, 04 Jun 2013 23:59:59 +0200 |
|
mod_http_files: Put the MIME type map in a global shared table
|
Kim Alvefur |
Thu, 13 Jun 2013 23:31:11 +0200 |
|
util.sasl.external: Add SASL EXTERNAL mechanism
|
Kim Alvefur |
Thu, 13 Jun 2013 18:20:49 +0200 |
|
prosody: Remove global ssl context, no longer used
|
Kim Alvefur |
Thu, 13 Jun 2013 17:48:09 +0200 |
|
mod_tls: Refactor to allow separate SSL configuration for c2s and s2s connections
|
Kim Alvefur |
Thu, 13 Jun 2013 17:47:45 +0200 |
|
certmanager: Overhaul of how ssl configs are built.
|
Kim Alvefur |
Thu, 13 Jun 2013 17:44:42 +0200 |
|
Merge 0.9->trunk
|
Matthew Wild |
Thu, 13 Jun 2013 13:56:58 +0100 |
|
mod_pep: When a client supplies no id on a published item, reflect our generated id back to it
|
Florian Zeitz |
Thu, 13 Jun 2013 13:56:35 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Thu, 13 Jun 2013 12:07:46 +0100 |
|
mod_muc: Fix incorrect variable name
|
Matthew Wild |
Tue, 21 May 2013 10:10:28 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Thu, 13 Jun 2013 00:46:29 +0100 |
|
certmanager: Add single_dh_use and single_ecdh_use to default options
|
Matthew Wild |
Thu, 13 Jun 2013 00:45:41 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Thu, 13 Jun 2013 00:09:56 +0100 |
|
certmanager: Set ssl.curve to 'secp384r1' by default, to enable ECC ciphers
|
Matthew Wild |
Thu, 13 Jun 2013 00:04:04 +0100 |
|
util.pubsub: Check whether node exists, when deleting
|
Florian Zeitz |
Wed, 12 Jun 2013 16:53:51 +0200 |
|
Merge 0.9->trunk
|
Matthew Wild |
Tue, 11 Jun 2013 21:50:41 +0100 |
|
certmanager: Use 'curve' and 'dhparam' options from ssl config if present
|
Matthew Wild |
Tue, 11 Jun 2013 21:44:53 +0100 |
|
mod_admin_telnet: Add server:memory() command to view details of Prosody's memory usage
|
Matthew Wild |
Thu, 16 May 2013 10:47:22 +0100 |
|
mod_bosh: Remove Connection: keep-alive header (conflicts with new net.http.server)
|
Matthew Wild |
Fri, 07 Jun 2013 17:47:49 +0100 |
|
mod_bosh: Fix global write
|
Matthew Wild |
Fri, 07 Jun 2013 17:47:27 +0100 |
|
mod_c2s, mod_s2s: Fire an event on read timeouts
|
Kim Alvefur |
Tue, 11 Jun 2013 21:36:15 +0200 |
|
mod_c2s: Become a shared module and allow being disabled on some virtualhosts
|
Kim Alvefur |
Tue, 11 Jun 2013 21:18:51 +0200 |
|
mod_bosh: Reduce a little code.
|
Waqas Hussain |
Tue, 11 Jun 2013 12:55:47 -0400 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Mon, 10 Jun 2013 14:37:02 +0200 |
|
mod_admin_telnet: Fix another wrong boolean expression
|
Kim Alvefur |
Mon, 10 Jun 2013 14:35:35 +0200 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Sun, 09 Jun 2013 17:03:15 +0200 |
|
net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks elghinn)
|
Kim Alvefur |
Sun, 09 Jun 2013 17:00:26 +0200 |
|
mod_admin_telnet: Simplify IPv6 detection, fixes rare traceback
|
Kim Alvefur |
Sun, 09 Jun 2013 12:59:23 +0200 |
|
mod_s2s: Set s2s_session.ip
|
Kim Alvefur |
Sun, 09 Jun 2013 12:54:10 +0200 |
|
mod_bosh: Make waiting_requests and dead_sessions shared to preserve across reloads
|
Matthew Wild |
Sat, 08 Jun 2013 18:08:18 +0100 |
|
mod_muc: Include status code 332 on service shutdown (thanks mathieui)
|
Matthew Wild |
Sat, 08 Jun 2013 18:07:36 +0100 |
|
mod_bosh: Don't tostring() stream:features when passing to session.send().
|
Waqas Hussain |
Fri, 07 Jun 2013 16:26:08 -0400 |
|
prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates
|
Kim Alvefur |
Fri, 07 Jun 2013 20:59:43 +0200 |
|
certmanager: Complain if key or certificate is missing from SSL config.
|
Kim Alvefur |
Fri, 07 Jun 2013 20:55:02 +0200 |
|
prosodyctl: Add 'prosodyctl check --help'
|
Kim Alvefur |
Fri, 07 Jun 2013 20:05:23 +0200 |
|
mod_bosh: Only return CORS headers if the Origin header is received, and CORS is enabled.
|
Waqas Hussain |
Fri, 07 Jun 2013 14:20:13 -0400 |
|
mod_bosh: Return empty string from the OPTIONS event handler, don't return the response object itself.
|
Waqas Hussain |
Fri, 07 Jun 2013 13:24:56 -0400 |
|
mod_bosh: Rename event handler argument to event, not request.
|
Waqas Hussain |
Fri, 07 Jun 2013 13:21:38 -0400 |
|
Merge 0.9->trunk
|
Matthew Wild |
Fri, 07 Jun 2013 13:23:04 +0100 |
|
mod_bosh: Remove logging of request.id, it doesn't exist in the new HTTP server API (thanks Mikael Nordfeldth)
|
Matthew Wild |
Fri, 07 Jun 2013 13:22:13 +0100 |
|
mod_bosh: Remove another place we set headers, fixes #348
|
Matthew Wild |
Thu, 06 Jun 2013 14:48:41 +0100 |
|
mod_bosh: Clean up handling of response headers, set them only in one place
|
Matthew Wild |
Wed, 05 Jun 2013 21:41:27 +0100 |
|
mod_bosh: Return errors when appropriate (invalid XML, missing sid)
|
Matthew Wild |
Wed, 05 Jun 2013 21:39:56 +0100 |
|
mod_bosh: Remove some very verbose logging
|
Matthew Wild |
Wed, 05 Jun 2013 21:37:33 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Wed, 05 Jun 2013 21:36:29 +0100 |
|
mod_bosh: Reset creating_session to prevent putting unnecessary attributes into every BOSH response
|
Matthew Wild |
Wed, 05 Jun 2013 21:35:50 +0100 |
|
mod_admin_telnet: Fix inverted boolean logic
|
Kim Alvefur |
Tue, 04 Jun 2013 19:35:41 +0200 |
|
net.server_select: Ensure _maxfd = math.huge on Windows, always.
|
Waqas Hussain |
Sun, 02 Jun 2013 16:23:19 -0400 |
|
configure: Fix poor layout
|
James Callahan |
Mon, 03 Jun 2013 12:50:37 -0400 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Sun, 02 Jun 2013 19:27:45 +0200 |
|
mod_bosh: Fix traceback in case session is destroyed during the stream-features event (thanks Biszkopcik)
|
Kim Alvefur |
Sun, 02 Jun 2013 19:25:53 +0200 |
|
mod_c2s, mod_c2s: Send a whitespace on read timeout, to prod TCP into detecting if the connection died
|
Kim Alvefur |
Thu, 30 May 2013 14:32:40 +0200 |
|
mod_register: get_child_text()!
|
Kim Alvefur |
Tue, 28 May 2013 18:32:51 +0200 |
