Matthew Wild [Fri, 9 Apr 2010 11:32:25 +0000 (12:32 +0100)]
Merge 0.7->trunk
Matthew Wild [Fri, 9 Apr 2010 11:31:51 +0000 (12:31 +0100)]
Merge 0.6->0.7
Matthew Wild [Fri, 9 Apr 2010 11:25:54 +0000 (12:25 +0100)]
net.server: Fix logic error causing traceback when receiving a non-number port
Matthew Wild [Wed, 7 Apr 2010 20:08:16 +0000 (21:08 +0100)]
loggingmanager: Fix syntax error :)
Matthew Wild [Wed, 7 Apr 2010 20:01:06 +0000 (21:01 +0100)]
Merge 0.7->trunk
Matthew Wild [Wed, 7 Apr 2010 20:00:20 +0000 (21:00 +0100)]
util.timer: When using libevent hold onto the event handle to stop it being collected (and the timer stopping). Fixes BOSH ghosts, thanks Flo, niekie, waqas.
Matthew Wild [Wed, 7 Apr 2010 16:41:35 +0000 (17:41 +0100)]
loggingmanager: Observe 'debug' config setting for console logging too
Matthew Wild [Sat, 3 Apr 2010 22:09:59 +0000 (23:09 +0100)]
Merge 0.7->trunk
Matthew Wild [Sat, 3 Apr 2010 22:09:11 +0000 (23:09 +0100)]
Merge 0.6->0.7
Matthew Wild [Sat, 3 Apr 2010 21:26:14 +0000 (22:26 +0100)]
Merge 0.6/MattJ -> 0.6
Matthew Wild [Sat, 3 Apr 2010 21:24:39 +0000 (22:24 +0100)]
mod_bosh: Default stanza namespace should be jabber:client (fixes BOSH to work with recent namespace fix)
Waqas Hussain [Thu, 1 Apr 2010 14:28:23 +0000 (19:28 +0500)]
util.ztact: Fixed global accesses.
Waqas Hussain [Thu, 1 Apr 2010 14:27:26 +0000 (19:27 +0500)]
util.uuid: Use a local instead of a global.
Waqas Hussain [Thu, 1 Apr 2010 14:12:08 +0000 (19:12 +0500)]
util.stanza: Fixed some more nil global accesses.
Waqas Hussain [Thu, 1 Apr 2010 14:08:25 +0000 (19:08 +0500)]
util.stanza: Fixed a nil global access.
Matthew Wild [Tue, 30 Mar 2010 18:48:04 +0000 (19:48 +0100)]
Merge 0.7->trunk
Matthew Wild [Tue, 30 Mar 2010 18:46:53 +0000 (19:46 +0100)]
Merge 0.7/waqas->0.7/MattJ
Matthew Wild [Tue, 30 Mar 2010 18:45:56 +0000 (19:45 +0100)]
Merge 0.6->0.7
Matthew Wild [Tue, 30 Mar 2010 18:44:50 +0000 (19:44 +0100)]
xmppserver_listener: Compatibility fix for older Prosodies with the s2s xmlns bug
Matthew Wild [Tue, 30 Mar 2010 18:40:16 +0000 (19:40 +0100)]
stanza_router, s2smanager, modulemanager: Fix for handling of the default namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted
Waqas Hussain [Fri, 26 Mar 2010 03:24:29 +0000 (08:24 +0500)]
net.server_event: Fixed spelling fail.
Matthew Wild [Thu, 25 Mar 2010 19:40:38 +0000 (19:40 +0000)]
Merge 0.7->trunk
Matthew Wild [Thu, 25 Mar 2010 19:34:41 +0000 (19:34 +0000)]
tools/erlparse: Discard erlang PIDs instead of choking on them as a syntax error
Matthew Wild [Thu, 25 Mar 2010 19:34:05 +0000 (19:34 +0000)]
tools/erlparse: Report the line number when showing a syntax error in the input file
Matthew Wild [Thu, 25 Mar 2010 19:32:35 +0000 (19:32 +0000)]
tools/erlparse: Optimisations aplenty for faster processing of large files
Matthew Wild [Thu, 25 Mar 2010 18:53:17 +0000 (18:53 +0000)]
Merge 0.7->trunk
Matthew Wild [Thu, 25 Mar 2010 18:52:34 +0000 (18:52 +0000)]
tools/ejabberd2prosody: Create prosody singleton so datamanager can detect the platform (set no platform to use lfs, pposix isn't necessary here)
Matthew Wild [Thu, 25 Mar 2010 12:33:45 +0000 (12:33 +0000)]
Merge 0.7->trunk
Matthew Wild [Thu, 25 Mar 2010 12:32:25 +0000 (12:32 +0000)]
net.server_event: Don't re-try a write if the connection closed (thanks Flo)
Matthew Wild [Wed, 24 Mar 2010 22:48:12 +0000 (22:48 +0000)]
Merge 0.7->trunk
Matthew Wild [Wed, 24 Mar 2010 22:46:57 +0000 (22:46 +0000)]
net.server_event: Bump timeout values up somewhat
Matthew Wild [Wed, 24 Mar 2010 22:41:43 +0000 (22:41 +0000)]
Merge 0.7->trunk
Matthew Wild [Wed, 24 Mar 2010 22:40:53 +0000 (22:40 +0000)]
Merge 0.7/waqas->0.7/MattJ
Matthew Wild [Wed, 24 Mar 2010 22:34:59 +0000 (22:34 +0000)]
Merge 0.6->0.7
Matthew Wild [Wed, 24 Mar 2010 20:00:22 +0000 (20:00 +0000)]
mod_tls: Add s2s_allow_encryption option which, when set to false, disabled TLS for s2s
Waqas Hussain [Tue, 23 Mar 2010 19:07:17 +0000 (00:07 +0500)]
util.sasl.digest-md5: Removed unnnecessary check (which included a nil global access).
Waqas Hussain [Tue, 23 Mar 2010 19:05:55 +0000 (00:05 +0500)]
mod_register: Use set_password to set passwords instead of create_user.
Waqas Hussain [Tue, 23 Mar 2010 19:03:31 +0000 (00:03 +0500)]
usermanager: Added function set_password.
Waqas Hussain [Tue, 23 Mar 2010 15:55:28 +0000 (20:55 +0500)]
prosody.cfg.lua.dist: Whitespace fix.
Waqas Hussain [Tue, 23 Mar 2010 15:48:57 +0000 (20:48 +0500)]
prosody.cfg.lua.dist: Disable mod_privacy by default.
Waqas Hussain [Tue, 23 Mar 2010 15:24:56 +0000 (20:24 +0500)]
usermanager: Return sane errors/results when Cyrus SASL is in use.
Waqas Hussain [Tue, 23 Mar 2010 15:17:46 +0000 (20:17 +0500)]
mod_saslauth: Tidier code for SASL backend selection.
Waqas Hussain [Tue, 23 Mar 2010 15:11:39 +0000 (20:11 +0500)]
mod_saslauth: Fail with an error when the requested SASL backend cannot be used.
Matthew Wild [Mon, 22 Mar 2010 17:26:12 +0000 (17:26 +0000)]
Merge 0.7->trunk
Matthew Wild [Mon, 22 Mar 2010 17:24:55 +0000 (17:24 +0000)]
Merge 0.6->0.7
Matthew Wild [Mon, 22 Mar 2010 17:16:28 +0000 (17:16 +0000)]
util.windows: Convert from Windows line endings
Matthew Wild [Mon, 22 Mar 2010 17:06:15 +0000 (17:06 +0000)]
Update copyright headers for 2010
Waqas Hussain [Mon, 22 Mar 2010 16:58:38 +0000 (21:58 +0500)]
loggingmanager: Don't use non-standard format specifier to format the timestamp.
Matthew Wild [Mon, 22 Mar 2010 16:55:10 +0000 (16:55 +0000)]
util.xmppstream: new() now returns a parser object
Matthew Wild [Mon, 22 Mar 2010 16:24:49 +0000 (16:24 +0000)]
util.xmppstream: Initial commit
Matthew Wild [Mon, 22 Mar 2010 15:05:35 +0000 (15:05 +0000)]
Merge 0.7->trunk
Waqas Hussain [Mon, 22 Mar 2010 15:05:05 +0000 (15:05 +0000)]
stanza_router: Don't send error replies for stanzas of type 'error' and 'result' on unbound authenticated connections. [originally
fa84451e9b35 in 0.6]
Waqas Hussain [Mon, 22 Mar 2010 15:04:22 +0000 (15:04 +0000)]
stanza_router: Allow non-jabber:client elements after auth, before bind. [originally
2c538d4bde13 in 0.6]
Matthew Wild [Mon, 22 Mar 2010 14:59:03 +0000 (14:59 +0000)]
Merge 0.7->trunk
Matthew Wild [Mon, 22 Mar 2010 14:58:25 +0000 (14:58 +0000)]
sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions (fixes a logging traceback, thanks Flo)
Matthew Wild [Mon, 22 Mar 2010 14:38:01 +0000 (14:38 +0000)]
Merge 0.7->trunk
Matthew Wild [Mon, 22 Mar 2010 14:36:53 +0000 (14:36 +0000)]
mod_groups: Ignore whitespace on group member JID lines (thanks Luis!)
Matthew Wild [Mon, 22 Mar 2010 14:35:02 +0000 (14:35 +0000)]
mod_groups: Fixes to make compatible with roster versioning - set version to 'true' to indicate that the roster is not being versioned
Matthew Wild [Mon, 22 Mar 2010 14:33:38 +0000 (14:33 +0000)]
mod_groups: Missed hunk from last commit, don't create the list of public group members unless necessary
Matthew Wild [Mon, 22 Mar 2010 14:32:23 +0000 (14:32 +0000)]
mod_groups: Only create group lists when necessary (now we can reliably detect when a user is in /any/ group, including public ones)
Matthew Wild [Mon, 22 Mar 2010 14:28:25 +0000 (14:28 +0000)]
rostermanager: Don't bump the roster version if it is == true (ie. we are not versioning the roster)
Matthew Wild [Mon, 22 Mar 2010 01:54:22 +0000 (01:54 +0000)]
mod_roster: Tidier code for the roster versioning logic
Matthew Wild [Mon, 22 Mar 2010 01:54:22 +0000 (01:54 +0000)]
mod_roster: Tidier code for the roster versioning logic
Matthew Wild [Sat, 20 Mar 2010 14:17:51 +0000 (14:17 +0000)]
Merge 0.7->trunk
Matthew Wild [Sat, 20 Mar 2010 14:16:33 +0000 (14:16 +0000)]
.hgignore: Ignore prosody.version (thanks Florob)
Matthew Wild [Thu, 18 Mar 2010 10:11:11 +0000 (10:11 +0000)]
Merge 0.7->trunk
Matthew Wild [Thu, 18 Mar 2010 10:10:37 +0000 (10:10 +0000)]
util.sasl_cyrus: Return invalid-mechanism instead of undefined-condition where appropriate
Matthew Wild [Thu, 18 Mar 2010 10:05:35 +0000 (10:05 +0000)]
util.sasl_cyrus: Clarify some log messages and levels
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