Matthew Wild [Mon, 23 Jan 2012 00:11:01 +0000 (00:11 +0000)]
prosody: Remove connlisteners, and net_activate_ports
Matthew Wild [Mon, 23 Jan 2012 00:07:15 +0000 (00:07 +0000)]
portmanager: Pass port to friendly_error_message()
Matthew Wild [Mon, 23 Jan 2012 00:00:10 +0000 (00:00 +0000)]
util.iterators: Make a standard library (no longer injects into global namespace)
Matthew Wild [Sun, 22 Jan 2012 23:59:19 +0000 (23:59 +0000)]
util.set: Accept nil to add_list()
Matthew Wild [Sun, 22 Jan 2012 23:57:13 +0000 (23:57 +0000)]
mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s
Matthew Wild [Sun, 22 Jan 2012 23:55:48 +0000 (23:55 +0000)]
portmanager: One manager to, in the darkness, bind them
Matthew Wild [Sun, 22 Jan 2012 22:55:49 +0000 (22:55 +0000)]
Merge with trunk
Matthew Wild [Sun, 22 Jan 2012 19:50:08 +0000 (19:50 +0000)]
mod_admin_telnet: Use module:shared() to expose commands table and default console environment
Matthew Wild [Sun, 22 Jan 2012 19:48:53 +0000 (19:48 +0000)]
moduleapi: Add module:shared(), a way to easily share data between multiple loaded modules
Matthew Wild [Sun, 22 Jan 2012 19:35:50 +0000 (19:35 +0000)]
moduleapi: Add module:depends(), a way to safely depend upon another module at runtime
Matthew Wild [Sun, 22 Jan 2012 19:27:06 +0000 (19:27 +0000)]
modulemanager: load(): Return and use the correct module object
Matthew Wild [Sun, 22 Jan 2012 19:10:13 +0000 (19:10 +0000)]
util.helpers: After nearly 'fixing' this code, I conclude it instead only deserves a bigger smile
Matthew Wild [Sun, 22 Jan 2012 18:49:49 +0000 (18:49 +0000)]
modulemanager: Cleanup some unused variables, imports, whitespace and add a comment.
Matthew Wild [Sun, 22 Jan 2012 18:49:11 +0000 (18:49 +0000)]
modulemanager, moduleapi: Replace hooks multitable with an event_handlers map stored in individual modules. Also adds module:hook_object_event() to hook events on any util.events compatible object.
Matthew Wild [Sun, 22 Jan 2012 18:47:33 +0000 (18:47 +0000)]
modulemanager: Drop unnecessary prosody_events local
Matthew Wild [Sun, 22 Jan 2012 18:46:17 +0000 (18:46 +0000)]
modulemanager: Some reorganisation. Only external change is (should be) that module-unloaded and module-loaded are no longer fired when reloading a module, the new event module-reloaded is fired instead.
Matthew Wild [Sun, 22 Jan 2012 18:41:55 +0000 (18:41 +0000)]
modulemanager: Move in-module API functions to core.moduleapi (half the file size, yay)
Kim Alvefur [Thu, 19 Jan 2012 15:47:12 +0000 (16:47 +0100)]
mod_compression: Change default compression level to 7
Kim Alvefur [Thu, 19 Jan 2012 15:38:04 +0000 (16:38 +0100)]
mod_compression: Use get_option_number
Matthew Wild [Wed, 18 Jan 2012 15:08:05 +0000 (15:08 +0000)]
Merge with trunk
Matthew Wild [Wed, 18 Jan 2012 15:07:40 +0000 (15:07 +0000)]
Merge with 0.9
Matthew Wild [Wed, 18 Jan 2012 15:07:26 +0000 (15:07 +0000)]
mod_tls: Fix log statement (thanks Zash)
Waqas Hussain [Wed, 18 Jan 2012 03:54:26 +0000 (08:54 +0500)]
util.json: Added function encode_ordered(object).
Matthew Wild [Tue, 17 Jan 2012 17:56:36 +0000 (17:56 +0000)]
xmppserver_listener: Only re-attempt connection on disconnect if it was an unauthenticated s2sout (thanks Medics for the log)
Matthew Wild [Tue, 17 Jan 2012 00:31:30 +0000 (00:31 +0000)]
Merge with 0.9
Matthew Wild [Tue, 17 Jan 2012 00:30:52 +0000 (00:30 +0000)]
net.http: Pass response object to callbacks (feels hacky, should this be passed *instead of* the request?)
Matthew Wild [Mon, 16 Jan 2012 04:44:23 +0000 (04:44 +0000)]
net.server_event: Fix :pause() to actually stop reading from the socket, rather than ignoring socket-readable events (!), and :resume() to restart the event listener
Matthew Wild [Fri, 13 Jan 2012 23:30:32 +0000 (23:30 +0000)]
util.throttle: Fix 'outstanding' return value
Matthew Wild [Fri, 13 Jan 2012 23:30:32 +0000 (23:30 +0000)]
util.throttle: Fix 'outstanding' return value
Matthew Wild [Fri, 13 Jan 2012 23:30:00 +0000 (23:30 +0000)]
util.throttle: Import setmetatable
Matthew Wild [Fri, 13 Jan 2012 23:30:00 +0000 (23:30 +0000)]
util.throttle: Import setmetatable
Matthew Wild [Fri, 13 Jan 2012 15:46:36 +0000 (15:46 +0000)]
util.debug: Adjust level within get_locals_table() to account for the additional depth of this function itself
Marco Cirillo [Fri, 6 Jan 2012 21:45:33 +0000 (21:45 +0000)]
mod_component: removed unused variable reference, added "flagging" to assert if a component is connected or not.
Marco Cirillo [Fri, 6 Jan 2012 21:43:30 +0000 (21:43 +0000)]
net.xmppcomponent_listener: removed unused variable reference.
Matthew Wild [Wed, 21 Dec 2011 07:58:22 +0000 (07:58 +0000)]
util.stanza: Remove unused __add metamethod
Matthew Wild [Tue, 20 Dec 2011 17:36:38 +0000 (17:36 +0000)]
s2smanager: Fix missing import of 'type' (thanks darkrain)
Matthew Wild [Fri, 16 Dec 2011 16:01:59 +0000 (16:01 +0000)]
hostmanager: Add send() method to hosts
Waqas Hussain [Wed, 14 Dec 2011 02:19:58 +0000 (07:19 +0500)]
usermanager: Prep admin JIDs (fixes issue#276).
Waqas Hussain [Wed, 14 Dec 2011 01:46:24 +0000 (06:46 +0500)]
s2smanager: Don't throw an error when the "interface" config option is a string (which it is by default).
Waqas Hussain [Wed, 14 Dec 2011 01:42:23 +0000 (06:42 +0500)]
mod_bosh: Remove unused reference to lxp
Matthew Wild [Tue, 13 Dec 2011 15:42:21 +0000 (15:42 +0000)]
sessionmanager: Remove unused reference to modulemanager
Matthew Wild [Tue, 13 Dec 2011 15:40:37 +0000 (15:40 +0000)]
s2smanager: Remove unused reference to modulemanager
Matthew Wild [Tue, 13 Dec 2011 13:34:21 +0000 (13:34 +0000)]
modulemanager: Remove 'config' from module environments (no modules use it that I'm aware of)
Waqas Hussain [Mon, 12 Dec 2011 09:53:12 +0000 (14:53 +0500)]
mod_watchregistrations: Fixed an undefined global access (thanks Medics).
Matthew Wild [Tue, 17 Jan 2012 21:10:16 +0000 (21:10 +0000)]
prosodyctl: Adjust description of 'reload' command (thanks crocket)
Waqas Hussain [Mon, 12 Dec 2011 09:53:12 +0000 (14:53 +0500)]
mod_watchregistrations: Fixed an undefined global access (thanks Medics).
James Callahan [Mon, 12 Dec 2011 06:08:48 +0000 (17:08 +1100)]
util/datamanager: Use package.config to figure out directory seperator
Matthew Wild [Sun, 11 Dec 2011 17:08:34 +0000 (17:08 +0000)]
configure: Add 'openbsd' preset (thanks xavier)
Matthew Wild [Sat, 10 Dec 2011 17:21:19 +0000 (17:21 +0000)]
configmanager: get(): Make section (core) optional (hurrah)
Matthew Wild [Tue, 24 Apr 2012 02:23:44 +0000 (03:23 +0100)]
Merge with Markus K?tter
Matthew Wild [Thu, 19 Apr 2012 18:35:10 +0000 (19:35 +0100)]
Merge with 0.9
Matthew Wild [Thu, 19 Apr 2012 18:30:47 +0000 (19:30 +0100)]
mod_bosh: Log error on BOSH parse failure (thanks daurnimator)
Markus K?tter [Fri, 13 Apr 2012 19:23:26 +0000 (21:23 +0200)]
muc - implement per channel history limits
- allow configuration via channel settings
- store the settings for permanent channels
- honor muc max_history_messages from the config as upper limit
- only broadcast_message with historic = true if history_length is > 0
Matthew Wild [Thu, 22 Mar 2012 16:51:39 +0000 (16:51 +0000)]
util.debug: Move boundary markers to top of relevant sections of the stack trace (easier to follow)
Matthew Wild [Thu, 22 Mar 2012 16:39:28 +0000 (16:39 +0000)]
util.debug: Add a touch of colour to source locations
Matthew Wild [Thu, 22 Mar 2012 16:07:57 +0000 (16:07 +0000)]
util.debug: Add a bit of colour
Matthew Wild [Thu, 22 Mar 2012 15:10:38 +0000 (15:10 +0000)]
util.debug: Move optimal line length (default 65) into a variable
Matthew Wild [Thu, 22 Mar 2012 15:09:37 +0000 (15:09 +0000)]
util.debug: Add markers in the output when crossing source file boundaries
Matthew Wild [Thu, 22 Mar 2012 15:08:21 +0000 (15:08 +0000)]
util.debug: Add catch for an "error in error handling"
Matthew Wild [Thu, 22 Mar 2012 15:07:27 +0000 (15:07 +0000)]
util.debug: Attempt to get debug.traceback() parameter handling correct (again)
Matthew Wild [Fri, 9 Mar 2012 18:46:19 +0000 (18:46 +0000)]
Merge 0.9->trunk
Kim Alvefur [Mon, 5 Mar 2012 21:11:29 +0000 (22:11 +0100)]
mod_admin_telnet: Add flag for IPv6
Kim Alvefur [Mon, 5 Mar 2012 21:11:05 +0000 (22:11 +0100)]
mod_admin_telnet: Add flag for stream management.
Kim Alvefur [Mon, 5 Mar 2012 21:10:09 +0000 (22:10 +0100)]
mod_admin_telnet: (encrypted) is redundant in combination with (secure)
Kim Alvefur [Mon, 5 Mar 2012 21:07:40 +0000 (22:07 +0100)]
mod_admin_telnet: Commond and flexible way to show stream properties.
Kim Alvefur [Sun, 4 Mar 2012 16:38:47 +0000 (17:38 +0100)]
core.s2smanager: Log the entire stream header.
Matthew Wild [Sat, 25 Feb 2012 17:21:15 +0000 (17:21 +0000)]
Merge with 0.9
Matthew Wild [Sat, 25 Feb 2012 02:03:26 +0000 (02:03 +0000)]
s2smanager: Fix traceback when socket.tcp6 isn't available
Kim Alvefur [Tue, 21 Feb 2012 20:13:13 +0000 (21:13 +0100)]
core.s2smanager: Fix check_cert_status() for when the stream has no from attr
Matthew Wild [Sun, 12 Feb 2012 17:55:22 +0000 (17:55 +0000)]
Merge with 0.9
Matthew Wild [Sun, 12 Feb 2012 17:53:50 +0000 (17:53 +0000)]
hostmanager: Import select() (thanks Medics)
Matthew Wild [Sun, 12 Feb 2012 14:21:09 +0000 (14:21 +0000)]
Merge with 0.9
Kim Alvefur [Sun, 12 Feb 2012 14:14:35 +0000 (15:14 +0100)]
mod_saslauth: Remove useless import of, and call to nodeprep.
Kim Alvefur [Sun, 12 Feb 2012 14:08:12 +0000 (15:08 +0100)]
mod_saslauth: Fire authentication-failure if make_authenticated() failed.
Kim Alvefur [Sun, 12 Feb 2012 14:05:31 +0000 (15:05 +0100)]
mod_saslauth: Move authentication-success event to after session has been made authenticated.
Matthew Wild [Sat, 11 Feb 2012 14:51:29 +0000 (14:51 +0000)]
Merge with 0.9
Matthew Wild [Sat, 11 Feb 2012 14:51:00 +0000 (14:51 +0000)]
hostmanager: Import jid_split (thanks chris)
Matthew Wild [Sat, 11 Feb 2012 14:49:51 +0000 (14:49 +0000)]
util.prosodyctl: Fix variable name clash introduced in
55ef5d83d00a (thanks chris)
Matthew Wild [Wed, 8 Feb 2012 15:20:07 +0000 (16:20 +0100)]
Merge with 0.9
Kim Alvefur [Wed, 8 Feb 2012 14:33:36 +0000 (15:33 +0100)]
util.prosodyctl: In the register command, check that the virtual exists before proceeding.
Waqas Hussain [Sat, 4 Feb 2012 19:10:13 +0000 (00:10 +0500)]
tools/ejabberdsql2prosody: Handle INSERT statement form where column list is specified (by skipping the column list).
Waqas Hussain [Sat, 4 Feb 2012 19:06:20 +0000 (00:06 +0500)]
util.template: Refactoring to make the string->stanza conversion code more generic.
Matthew Wild [Thu, 26 Jan 2012 18:48:21 +0000 (18:48 +0000)]
Merge with 0.9
Matthew Wild [Thu, 26 Jan 2012 18:47:59 +0000 (18:47 +0000)]
Merge with Zash
Waqas Hussain [Wed, 25 Jan 2012 06:54:12 +0000 (11:54 +0500)]
util.xmppstream: Optimize attribute processing.
Waqas Hussain [Wed, 25 Jan 2012 06:49:27 +0000 (11:49 +0500)]
util.xmppstream: Have faith in the XML parser matching start and end tags.
Waqas Hussain [Wed, 25 Jan 2012 06:47:51 +0000 (11:47 +0500)]
util.xmppstream: Remove some unnecessary code.
Paul Aurich [Tue, 24 Jan 2012 22:58:54 +0000 (14:58 -0800)]
s2smanager: Log the host when marking it authenticated
Paul Aurich [Tue, 24 Jan 2012 22:57:53 +0000 (14:57 -0800)]
mod_saslauth: "" ~= nil (thanks, Zash!)
Kim Alvefur [Fri, 20 Jan 2012 21:04:28 +0000 (22:04 +0100)]
prosodyctl: Add commands for generating certificates and keys
Kim Alvefur [Fri, 20 Jan 2012 20:59:13 +0000 (21:59 +0100)]
user.x509: Add some utility functions for generating OpenSSL configs
Kim Alvefur [Fri, 20 Jan 2012 20:58:04 +0000 (21:58 +0100)]
util.prosodyctl: Add getline() and show_prompt()
Waqas Hussain [Wed, 18 Jan 2012 03:54:26 +0000 (08:54 +0500)]
util.json: Added function encode_ordered(object).
Matthew Wild [Fri, 16 Dec 2011 16:01:59 +0000 (16:01 +0000)]
hostmanager: Add send() method to hosts
Matthew Wild [Tue, 31 Jan 2012 22:41:21 +0000 (22:41 +0000)]
prosody.cfg.lua.dist: Comment mod_legacyauth by default (thanks Zash)
Matthew Wild [Sat, 10 Dec 2011 05:45:07 +0000 (05:45 +0000)]
mod_adhoc: Use module:handle_items()
Waqas Hussain [Fri, 9 Dec 2011 07:02:21 +0000 (12:02 +0500)]
util.array: Avoid globals.
Waqas Hussain [Fri, 9 Dec 2011 06:57:14 +0000 (11:57 +0500)]
util.array: Make array:push() chainable.
Waqas Hussain [Fri, 9 Dec 2011 06:44:00 +0000 (11:44 +0500)]
mod_bosh: Fixed use of a private HTTP request property.
Waqas Hussain [Fri, 9 Dec 2011 06:38:35 +0000 (11:38 +0500)]
net.httpserver: Removed unused import.