Paul Aurich [Thu, 18 Mar 2010 01:57:19 +0000 (18:57 -0700)]
util.sasl_cyrus: Protect the call to cyrussasl.server_new properly.
Matthew Wild [Thu, 18 Mar 2010 01:44:55 +0000 (01:44 +0000)]
Merge 0.7->trunk
Matthew Wild [Thu, 18 Mar 2010 01:31:37 +0000 (01:31 +0000)]
Merge darkrain->trunk
Matthew Wild [Thu, 18 Mar 2010 01:27:31 +0000 (01:27 +0000)]
Merge 0.7->trunk
Matthew Wild [Thu, 18 Mar 2010 01:25:50 +0000 (01:25 +0000)]
Merge 0.6->0.7
Matthew Wild [Thu, 18 Mar 2010 01:16:39 +0000 (01:16 +0000)]
Merge 0.6 with waqas
Matthew Wild [Thu, 18 Mar 2010 01:15:25 +0000 (01:15 +0000)]
s2smanager: Remove the infamous 'as per RFC' log message entirely (it happens too often to be useful)
Paul Aurich [Wed, 17 Mar 2010 22:29:14 +0000 (15:29 -0700)]
util.sasl_cyrus: If available, use a c14n callback for interoperability with bad clients.
Specifically, clients that specify an authzid 'user@domain.com' and authcid 'user'.
Paul Aurich [Wed, 17 Mar 2010 22:29:14 +0000 (15:29 -0700)]
util.sasl_cyrus: If available, use a c14n callback for interoperability with bad clients.
Specifically, clients that specify an authzid 'user@domain.com' and authcid 'user'.
Paul Aurich [Wed, 17 Mar 2010 22:29:14 +0000 (15:29 -0700)]
mod_saslauth: Add a sasl_realm option
Paul Aurich [Wed, 17 Mar 2010 22:29:14 +0000 (15:29 -0700)]
mod_saslauth: Add a sasl_realm option
Matthew Wild [Wed, 17 Mar 2010 14:36:23 +0000 (14:36 +0000)]
Merge with 0.7
Matthew Wild [Wed, 17 Mar 2010 14:28:26 +0000 (14:28 +0000)]
Merge ... 0.6 (into 0.7, namely mod_compression fixes)
Paul Aurich [Tue, 16 Mar 2010 06:02:16 +0000 (23:02 -0700)]
util.cyrus_sasl: Pass the realm to Cyrus
Paul Aurich [Tue, 16 Mar 2010 06:02:16 +0000 (23:02 -0700)]
util.cyrus_sasl: Pass the realm to Cyrus
Waqas Hussain [Tue, 16 Mar 2010 22:16:43 +0000 (03:16 +0500)]
MUC: Added support for letting clients manage discussion history.
Waqas Hussain [Mon, 15 Mar 2010 19:15:05 +0000 (00:15 +0500)]
mod_compression: Improved and lowered log level of some logged messages.
Matthew Wild [Mon, 15 Mar 2010 03:18:33 +0000 (03:18 +0000)]
Merge with 0.7 (and indirectly 0.6.2)
Waqas Hussain [Tue, 9 Mar 2010 15:14:47 +0000 (20:14 +0500)]
mod_compression: Return <setup-failed/> instead of <unsupported-method/> where applicable.
Waqas Hussain [Tue, 9 Mar 2010 13:19:50 +0000 (18:19 +0500)]
mod_compression: More robust stanza processing.
Waqas Hussain [Tue, 9 Mar 2010 13:11:45 +0000 (18:11 +0500)]
mod_compression: Don't succeed after indicating a failure.
Waqas Hussain [Tue, 9 Mar 2010 12:52:18 +0000 (17:52 +0500)]
mod_compression: Don't tell client compression succeeded when it didn't.
Waqas Hussain [Tue, 9 Mar 2010 12:43:18 +0000 (17:43 +0500)]
mod_compression: Fixed various possible tracebacks in logging.
Matthew Wild [Fri, 5 Mar 2010 18:35:23 +0000 (18:35 +0000)]
Merge with trunk
Matthew Wild [Fri, 5 Mar 2010 18:35:02 +0000 (18:35 +0000)]
Merge with 0.7
Matthew Wild [Fri, 5 Mar 2010 18:33:28 +0000 (18:33 +0000)]
net.dns: Trailing whitespace
Matthew Wild [Fri, 5 Mar 2010 18:15:08 +0000 (18:15 +0000)]
net.dns: More reliable parsing of resolv.conf - allow multiple nameserver IPs on one line (thanks dersd)
Matthew Wild [Fri, 5 Mar 2010 16:45:46 +0000 (16:45 +0000)]
net.server_select: Fix for traceback when a read returns an error and no data (thanks dersd)
Matthew Wild [Fri, 5 Mar 2010 15:00:11 +0000 (15:00 +0000)]
certmanager: Friendlier error reporting on OpenWRT and other cases where we don't understand the OpenSSL error
Matthew Wild [Fri, 5 Mar 2010 14:49:56 +0000 (14:49 +0000)]
certmanager: Fix nil global access (thanks Marc)
Matthew Wild [Wed, 3 Mar 2010 22:05:05 +0000 (22:05 +0000)]
Merge 0.6.2/waqas with 0.6.2/MattJ
Matthew Wild [Sun, 14 Mar 2010 03:07:05 +0000 (03:07 +0000)]
net.xmppcomponent_listener: Don't remove 'log' and 'close' from sessions when destroying, and set destroyed = true
Matthew Wild [Sun, 14 Mar 2010 03:06:19 +0000 (03:06 +0000)]
net.xmppcomponent_listener: Log invalid XML received from components (as we already do for c2s/s2s)
Matthew Wild [Sun, 14 Mar 2010 03:05:43 +0000 (03:05 +0000)]
net.xmppcomponent_listener: Don't allow closing a session that has already been destroyed
Matthew Wild [Sun, 14 Mar 2010 03:04:51 +0000 (03:04 +0000)]
net.xmppcomponent_listener: Close component sessions on receiving a </stream:stream>
Matthew Wild [Sun, 14 Mar 2010 03:04:04 +0000 (03:04 +0000)]
net.xmppcomponent_listener: Don't handle stream errors from component sessions that have already been destroyed
Matthew Wild [Sun, 14 Mar 2010 03:03:02 +0000 (03:03 +0000)]
net.xmppcomponent_listener: Fix to correctly handle stream errors from components
Matthew Wild [Sun, 14 Mar 2010 03:01:00 +0000 (03:01 +0000)]
net.xmppclient_listener: Fix to correctly handle stream errors from clients
Matthew Wild [Sun, 14 Mar 2010 02:59:41 +0000 (02:59 +0000)]
sessionmanager: Don't re-destroy destroyed sessions
Matthew Wild [Sun, 14 Mar 2010 02:59:16 +0000 (02:59 +0000)]
sessionmanager: Return stream error when incoming stream header is missing 'to' attribute
Matthew Wild [Sun, 14 Mar 2010 02:58:11 +0000 (02:58 +0000)]
sessionmanager: Add close method to resting sessions
Matthew Wild [Sun, 14 Mar 2010 02:57:22 +0000 (02:57 +0000)]
s2smanager: Don't re-destroy destroyed sessions
Matthew Wild [Sun, 14 Mar 2010 02:56:57 +0000 (02:56 +0000)]
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild [Thu, 11 Mar 2010 01:04:19 +0000 (01:04 +0000)]
sessionmanager, s2smanager: Close session on </stream:stream>
Matthew Wild [Mon, 8 Mar 2010 02:13:41 +0000 (02:13 +0000)]
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild [Sat, 6 Mar 2010 18:45:09 +0000 (18:45 +0000)]
net.xmppserver_listener: Clarify log message (for nil/false)
Matthew Wild [Wed, 3 Mar 2010 22:05:05 +0000 (22:05 +0000)]
Merge 0.6.2/waqas with 0.6.2/MattJ
Waqas Hussain [Wed, 3 Mar 2010 21:22:45 +0000 (02:22 +0500)]
stanza_router: Don't send error replies for stanzas of type 'error' and 'result' on unbound authenticated connections.
Waqas Hussain [Wed, 3 Mar 2010 21:20:17 +0000 (02:20 +0500)]
stanza_router: Allow non-jabber:client elements after auth, before bind.
Waqas Hussain [Tue, 2 Mar 2010 09:08:32 +0000 (14:08 +0500)]
mod_offline: Convert to Unix line endings.
Matthew Wild [Mon, 1 Mar 2010 21:03:17 +0000 (21:03 +0000)]
Merge with 0.7
Waqas Hussain [Mon, 1 Mar 2010 19:51:27 +0000 (00:51 +0500)]
util.sasl: Fixed a nil global access.
Waqas Hussain [Mon, 1 Mar 2010 19:50:54 +0000 (00:50 +0500)]
util.stanza: Fixed nil global accesses.
Matthew Wild [Mon, 1 Mar 2010 18:52:47 +0000 (18:52 +0000)]
certmanager: Fix global access
Matthew Wild [Mon, 1 Mar 2010 18:47:03 +0000 (18:47 +0000)]
net.server_select: Fix typo
Matthew Wild [Mon, 1 Mar 2010 18:46:37 +0000 (18:46 +0000)]
net.server_event: Fix some global accesses
Matthew Wild [Mon, 1 Mar 2010 18:08:52 +0000 (18:08 +0000)]
Merge with 0.7
Matthew Wild [Mon, 1 Mar 2010 18:07:37 +0000 (18:07 +0000)]
mod_proxy65: Fix for old-style closing of connections (another source of tracebacks with libevent enabled)
Matthew Wild [Mon, 1 Mar 2010 18:06:54 +0000 (18:06 +0000)]
net.server_select: Fix calling method of some handler.close()s
Matthew Wild [Mon, 1 Mar 2010 16:45:49 +0000 (16:45 +0000)]
Merge with 0.7
Matthew Wild [Mon, 1 Mar 2010 16:45:13 +0000 (16:45 +0000)]
net.server_event: Improve and fix potential traceback in logging of new incoming connections
Matthew Wild [Mon, 1 Mar 2010 16:23:51 +0000 (16:23 +0000)]
Merge with 0.7
Matthew Wild [Mon, 1 Mar 2010 16:23:26 +0000 (16:23 +0000)]
mod_saslauth: Add FIXME to remind myself to fix this as soon as I have time
Matthew Wild [Mon, 1 Mar 2010 16:04:35 +0000 (16:04 +0000)]
Merge with 0.7
Matthew Wild [Mon, 1 Mar 2010 16:03:37 +0000 (16:03 +0000)]
Merge with 0.7/waqas
Matthew Wild [Mon, 1 Mar 2010 16:02:59 +0000 (16:02 +0000)]
mod_saslauth: Unlock globals while loading cyrus
Matthew Wild [Mon, 1 Mar 2010 16:01:09 +0000 (16:01 +0000)]
Merge with 0.7
Waqas Hussain [Mon, 1 Mar 2010 13:37:47 +0000 (18:37 +0500)]
util.sasl_cyrus: Ensure the mechanisms table is available after a failed auth attempt.
Matthew Wild [Sat, 27 Feb 2010 19:46:04 +0000 (19:46 +0000)]
prosody: Bump log message describing current connection backend to level 'info'
Matthew Wild [Thu, 25 Feb 2010 21:37:59 +0000 (21:37 +0000)]
Merge with 0.7
Matthew Wild [Thu, 25 Feb 2010 18:25:17 +0000 (18:25 +0000)]
prosody.cfg.lua.dist: Fix missing quote in commented proxy config example
Matthew Wild [Thu, 25 Feb 2010 18:08:59 +0000 (18:08 +0000)]
Merge with 0.7
Matthew Wild [Thu, 25 Feb 2010 18:03:15 +0000 (18:03 +0000)]
Merge with 0.6
Matthew Wild [Thu, 25 Feb 2010 17:54:23 +0000 (17:54 +0000)]
tests/test_core_s2smanager.lua: Fix to compare SRV weights correctly
Matthew Wild [Thu, 25 Feb 2010 17:53:27 +0000 (17:53 +0000)]
s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault)
Matthew Wild [Thu, 25 Feb 2010 17:52:33 +0000 (17:52 +0000)]
s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain)
Matthew Wild [Thu, 25 Feb 2010 02:01:00 +0000 (02:01 +0000)]
net.server_event: Add lock_read() method to connections
Matthew Wild [Mon, 22 Feb 2010 01:48:42 +0000 (01:48 +0000)]
Merge with 0.7
Matthew Wild [Mon, 22 Feb 2010 01:48:07 +0000 (01:48 +0000)]
prosodyctl: Fix addplugin to support --help, and hide from the help listing (for now)
Matthew Wild [Mon, 22 Feb 2010 01:47:35 +0000 (01:47 +0000)]
prosodyctl: Fix 'restart' command to not report itself as the 'stop' command (thanks albert!)
Matthew Wild [Mon, 22 Feb 2010 01:06:46 +0000 (01:06 +0000)]
Merge with 0.7
Matthew Wild [Mon, 22 Feb 2010 01:04:27 +0000 (01:04 +0000)]
Merge with 0.7
Matthew Wild [Mon, 22 Feb 2010 01:02:16 +0000 (01:02 +0000)]
mod_console: Uncomment the help for server:shutdown() - thanks darkrain
Dwayne Bent [Mon, 22 Feb 2010 00:27:42 +0000 (19:27 -0500)]
prosodyctl.man: Update email address
Dwayne Bent [Mon, 22 Feb 2010 00:27:42 +0000 (19:27 -0500)]
prosodyctl.man: Update email address
Dwayne Bent [Mon, 22 Feb 2010 00:27:21 +0000 (19:27 -0500)]
prosodyctl.man: Include new restart command
Dwayne Bent [Mon, 22 Feb 2010 00:27:21 +0000 (19:27 -0500)]
prosodyctl.man: Include new restart command
Matthew Wild [Sun, 21 Feb 2010 20:53:23 +0000 (20:53 +0000)]
Merge with 0.7
Matthew Wild [Sun, 21 Feb 2010 20:52:54 +0000 (20:52 +0000)]
prosodyctl: Add restart command for KSid and johnny :)
Matthew Wild [Sun, 21 Feb 2010 17:33:37 +0000 (17:33 +0000)]
Merge with 0.7
Matthew Wild [Sun, 21 Feb 2010 17:33:13 +0000 (17:33 +0000)]
prosody.cfg.lua.dist: Update config for 0.7, most improvements from the Arch Linux package by dbb, thanks!
Matthew Wild [Sun, 21 Feb 2010 16:57:06 +0000 (16:57 +0000)]
ejabberd2prosody: Don't print passwords of imported accounts
Matthew Wild [Sun, 21 Feb 2010 16:44:37 +0000 (16:44 +0000)]
Merge trunk with trunk
Matthew Wild [Sun, 21 Feb 2010 16:43:55 +0000 (16:43 +0000)]
Merge 0.7 with 0.7 with trunk \o/
Matthew Wild [Sun, 21 Feb 2010 16:43:29 +0000 (16:43 +0000)]
Merge 0.7 with 0.7
Matthew Wild [Sun, 21 Feb 2010 16:43:05 +0000 (16:43 +0000)]
Merge with 0.7
Matthew Wild [Sun, 21 Feb 2010 16:42:26 +0000 (16:42 +0000)]
ejabberdsql2prosody: Don't print password of imported accounts (thanks azerttyu)
Waqas Hussain [Sun, 21 Feb 2010 12:47:49 +0000 (17:47 +0500)]
Merge with 0.7.
Waqas Hussain [Sun, 21 Feb 2010 12:43:39 +0000 (17:43 +0500)]
mod_iq: Fire sub-events for iq/self events.
Waqas Hussain [Sun, 21 Feb 2010 12:43:05 +0000 (17:43 +0500)]
stanza_router: Make sure /self events are fired when the 'to' attribute is missing.