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