prosody.git
12 years agoMerge timber->trunk - thanks everyone!
Matthew Wild [Tue, 24 Apr 2012 20:59:20 +0000 (21:59 +0100)]
Merge timber->trunk - thanks everyone!

12 years agonet.http.server: Handle results returned by handlers, and send as a response. Also...
Matthew Wild [Tue, 24 Apr 2012 18:07:12 +0000 (19:07 +0100)]
net.http.server: Handle results returned by handlers, and send as a response. Also removes explicit firing of '*', which can now be done via wildcard events.

12 years agonet.http.server: Remove debug message
Matthew Wild [Tue, 24 Apr 2012 18:05:45 +0000 (19:05 +0100)]
net.http.server: Remove debug message

12 years agoutil.helpers: Add show_events(), to show the events and handlers in a util.events...
Matthew Wild [Tue, 24 Apr 2012 17:54:34 +0000 (18:54 +0100)]
util.helpers: Add show_events(), to show the events and handlers in a util.events object

12 years agoutil.debug: Turn into a real-ish module ('debugx'), and require you call use() to...
Matthew Wild [Tue, 24 Apr 2012 17:53:50 +0000 (18:53 +0100)]
util.debug: Turn into a real-ish module ('debugx'), and require you call use() to override debug.traceback()

12 years agomod_proxy65: Port to portmanager, make a shared module
Matthew Wild [Tue, 24 Apr 2012 17:50:22 +0000 (18:50 +0100)]
mod_proxy65: Port to portmanager, make a shared module

12 years agomod_http: Fix specifying method in app route keys
Matthew Wild [Tue, 24 Apr 2012 15:02:30 +0000 (16:02 +0100)]
mod_http: Fix specifying method in app route keys

12 years agoportmanager: Add get_service_at(interface, port) and close(interface, port)
Matthew Wild [Tue, 24 Apr 2012 15:00:20 +0000 (16:00 +0100)]
portmanager: Add get_service_at(interface, port) and close(interface, port)

12 years agonet.server_event: Do not automatically close clients when closing a server port
Matthew Wild [Tue, 24 Apr 2012 14:52:30 +0000 (15:52 +0100)]
net.server_event: Do not automatically close clients when closing a server port

12 years agonet.server_select: Remove server from _server table when closing
Matthew Wild [Tue, 24 Apr 2012 14:42:35 +0000 (15:42 +0100)]
net.server_select: Remove server from _server table when closing

12 years agomod_admin_telnet: Add initial port:list() and port:close() commands
Matthew Wild [Tue, 24 Apr 2012 14:40:00 +0000 (15:40 +0100)]
mod_admin_telnet: Add initial port:list() and port:close() commands

12 years agoprosody: Load portmanager at startup, to ensure it is ready to receive item-added...
Matthew Wild [Tue, 24 Apr 2012 12:37:35 +0000 (13:37 +0100)]
prosody: Load portmanager at startup, to ensure it is ready to receive item-added events when modules are loaded

12 years agoMerge with Markus K?tter
Matthew Wild [Tue, 24 Apr 2012 02:23:44 +0000 (03:23 +0100)]
Merge with Markus K?tter

12 years agomod_http_files: Rename argument to reflect what it actually is
Kim Alvefur [Mon, 23 Apr 2012 22:17:15 +0000 (00:17 +0200)]
mod_http_files: Rename argument to reflect what it actually is

12 years agomod_httpserver: Rename to mod_http_files
Kim Alvefur [Mon, 23 Apr 2012 21:37:43 +0000 (23:37 +0200)]
mod_httpserver: Rename to mod_http_files

12 years agomod_httpserver: Adapt to use the new HTTP API
Kim Alvefur [Mon, 23 Apr 2012 21:36:50 +0000 (23:36 +0200)]
mod_httpserver: Adapt to use the new HTTP API

12 years agomod_http: Pass portion of path that matched wildcard to wildcard handlers, as a secon...
Matthew Wild [Mon, 23 Apr 2012 20:34:05 +0000 (21:34 +0100)]
mod_http: Pass portion of path that matched wildcard to wildcard handlers, as a second parameter

12 years agonet.http.server: Support for wildcard events (events that end with '/*')
Matthew Wild [Mon, 23 Apr 2012 20:29:18 +0000 (21:29 +0100)]
net.http.server: Support for wildcard events (events that end with '/*')

12 years agomod_http: Support for default_path in apps
Matthew Wild [Mon, 23 Apr 2012 17:23:49 +0000 (18:23 +0100)]
mod_http: Support for default_path in apps

12 years agomoduleapi: Add module:add_timer(delay, callback) - automatically halts the timer...
Matthew Wild [Mon, 23 Apr 2012 14:38:40 +0000 (15:38 +0100)]
moduleapi: Add module:add_timer(delay, callback) - automatically halts the timer on module unload

12 years agomodulemanager: Set module.loaded = false on unload
Matthew Wild [Mon, 23 Apr 2012 14:38:36 +0000 (15:38 +0100)]
modulemanager: Set module.loaded = false on unload

12 years agomod_http: Revamp module for new API and config
Matthew Wild [Mon, 23 Apr 2012 13:16:59 +0000 (14:16 +0100)]
mod_http: Revamp module for new API and config

12 years agomoduleapi: module:depends(): Load shared modules onto the current host even if they...
Matthew Wild [Mon, 23 Apr 2012 13:15:07 +0000 (14:15 +0100)]
moduleapi: module:depends(): Load shared modules onto the current host even if they are loaded globally already

12 years agomodulemanager: Report errors that happen when loading a shared module onto its origin...
Matthew Wild [Mon, 23 Apr 2012 13:11:10 +0000 (14:11 +0100)]
modulemanager: Report errors that happen when loading a shared module onto its original host

12 years agomoduleapi: module:provides(): Add "-provider" onto the key name
Matthew Wild [Mon, 23 Apr 2012 13:10:04 +0000 (14:10 +0100)]
moduleapi: module:provides(): Add "-provider" onto the key name

12 years agomoduleapi: module:provides(): Fix usage of wrong table
Matthew Wild [Mon, 23 Apr 2012 13:09:35 +0000 (14:09 +0100)]
moduleapi: module:provides(): Fix usage of wrong table

12 years agonet.http.server: Fix legacy net.httpserver fallback (httpserver is no longer a global).
Waqas Hussain [Sun, 22 Apr 2012 18:44:21 +0000 (23:44 +0500)]
net.http.server: Fix legacy net.httpserver fallback (httpserver is no longer a global).

12 years agonet.httpserver: Comment dependency on connlisteners. Further cleanup to follow.
Waqas Hussain [Sun, 22 Apr 2012 18:43:34 +0000 (23:43 +0500)]
net.httpserver: Comment dependency on connlisteners. Further cleanup to follow.

12 years agoMerge with Zash
Matthew Wild [Sun, 22 Apr 2012 18:03:50 +0000 (19:03 +0100)]
Merge with Zash

12 years agomod_component: Handle component connecting to non-existent host
Matthew Wild [Sun, 22 Apr 2012 15:35:26 +0000 (16:35 +0100)]
mod_component: Handle component connecting to non-existent host

12 years agomod_motd: Use presence/bare to catch a client's initial presence and send the MOTD...
Matthew Wild [Sun, 22 Apr 2012 13:54:36 +0000 (14:54 +0100)]
mod_motd: Use presence/bare to catch a client's initial presence and send the MOTD then (fixes #282)

12 years agomultiplex_listener: Remove (already ported to mod_net_multiplex)
Matthew Wild [Sat, 21 Apr 2012 21:54:55 +0000 (22:54 +0100)]
multiplex_listener: Remove (already ported to mod_net_multiplex)

12 years agomodulemanager: For children of shared modules, set module.environment to the empty...
Matthew Wild [Sat, 21 Apr 2012 21:53:22 +0000 (22:53 +0100)]
modulemanager: For children of shared modules, set module.environment to the empty environment for that module (useful to expose data or APIs at host.modules[module])

12 years agomoduleapi: Have modules internally store a reference to shared tables they use, to...
Matthew Wild [Sat, 21 Apr 2012 21:52:15 +0000 (22:52 +0100)]
moduleapi: Have modules internally store a reference to shared tables they use, to ensure they don't get collected while any module that had access to that table is still loaded (thanks Zash)

12 years agomod_component: Make a shared module, and move the xmppcomponent_listener into it...
Matthew Wild [Sat, 21 Apr 2012 21:50:57 +0000 (22:50 +0100)]
mod_component: Make a shared module, and move the xmppcomponent_listener into it ('port'ing over to portmanager). Ha ha.

12 years agocore.certmanager: Log a message when a password is required but not supplied. fixes...
Kim Alvefur [Sat, 21 Apr 2012 21:11:59 +0000 (23:11 +0200)]
core.certmanager: Log a message when a password is required but not supplied. fixes #214

12 years agomod_motd: Send only to resource coming online, not the user's bare JID (fixes #282)
Matthew Wild [Sat, 21 Apr 2012 20:16:53 +0000 (21:16 +0100)]
mod_motd: Send only to resource coming online, not the user's bare JID (fixes #282)

12 years agoprosody: Don't require net.httpserver now
Matthew Wild [Sat, 21 Apr 2012 20:03:57 +0000 (21:03 +0100)]
prosody: Don't require net.httpserver now

12 years agomod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when succe...
Matthew Wild [Sat, 21 Apr 2012 19:52:12 +0000 (20:52 +0100)]
mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228)

12 years agomod_admin_telnet: module:list(): List global modules (part-fixes #228)
Matthew Wild [Sat, 21 Apr 2012 19:39:52 +0000 (20:39 +0100)]
mod_admin_telnet: module:list(): List global modules (part-fixes #228)

12 years agomod_admin_telnet: module:reload(): If module is loaded on *, reload it there first...
Matthew Wild [Sat, 21 Apr 2012 19:39:21 +0000 (20:39 +0100)]
mod_admin_telnet: module:reload(): If module is loaded on *, reload it there first (ensuring shared module code is reloaded before per-host children of that module)

12 years agomod_admin_telnet: get_host_set(): Include '*' in the set if no specific hosts are...
Matthew Wild [Sat, 21 Apr 2012 19:38:27 +0000 (20:38 +0100)]
mod_admin_telnet: get_host_set(): Include '*' in the set if no specific hosts are specified and the module is loaded there

12 years agomodulemanager: When a shared module becomes global, ensure it still gets loaded onto...
Matthew Wild [Sat, 21 Apr 2012 19:37:06 +0000 (20:37 +0100)]
modulemanager: When a shared module becomes global, ensure it still gets loaded onto the original target host

12 years agomodulemanager: Support for shared modules - function module.add_host(host_module...
Matthew Wild [Sat, 21 Apr 2012 19:09:03 +0000 (20:09 +0100)]
modulemanager: Support for shared modules - function module.add_host(host_module) in a global module

12 years agomodulemanager: Make module_has_method and module_call_method use rawget()
Matthew Wild [Sat, 21 Apr 2012 19:04:07 +0000 (20:04 +0100)]
modulemanager: Make module_has_method and module_call_method use rawget()

12 years agomodulemanager: Use modulemap rather than hosts[host] (fix for when host == "*")
Matthew Wild [Sat, 21 Apr 2012 19:02:45 +0000 (20:02 +0100)]
modulemanager: Use modulemap rather than hosts[host] (fix for when host == "*")

12 years agomodulemanager: Use api_instance rather than pluginenv.module (same thing)
Matthew Wild [Sat, 21 Apr 2012 19:01:40 +0000 (20:01 +0100)]
modulemanager: Use api_instance rather than pluginenv.module (same thing)

12 years agomodulemanager: Allow loading a module onto "*" (part-fixes #228)
Matthew Wild [Sat, 21 Apr 2012 19:00:30 +0000 (20:00 +0100)]
modulemanager: Allow loading a module onto "*" (part-fixes #228)

12 years agonet.connlisteners: Be gone!
Matthew Wild [Sat, 21 Apr 2012 15:27:42 +0000 (16:27 +0100)]
net.connlisteners: Be gone!

12 years agomod_http: Include handlers of non-global modules.
Waqas Hussain [Sat, 21 Apr 2012 13:23:44 +0000 (18:23 +0500)]
mod_http: Include handlers of non-global modules.

12 years agomod_http: Provide HTTP service.
Waqas Hussain [Sat, 21 Apr 2012 12:38:48 +0000 (17:38 +0500)]
mod_http: Provide HTTP service.

12 years agonet.http.server: Fire global HTTP event when no specific handlers available.
Waqas Hussain [Sat, 21 Apr 2012 12:38:01 +0000 (17:38 +0500)]
net.http.server: Fire global HTTP event when no specific handlers available.

12 years agonet.http.server: Missing <title/> in 404 Not Found response.
Waqas Hussain [Sat, 21 Apr 2012 12:37:00 +0000 (17:37 +0500)]
net.http.server: Missing <title/> in 404 Not Found response.

12 years agoMerge with 0.9
Matthew Wild [Thu, 19 Apr 2012 18:35:10 +0000 (19:35 +0100)]
Merge with 0.9

12 years agomod_bosh: Log error on BOSH parse failure (thanks daurnimator)
Matthew Wild [Thu, 19 Apr 2012 18:30:47 +0000 (19:30 +0100)]
mod_bosh: Log error on BOSH parse failure (thanks daurnimator)

12 years agomuc - implement per channel history limits
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

12 years agomod_adhoc: Always allow at least the "complete" action
Florian Zeitz [Thu, 12 Apr 2012 22:39:00 +0000 (00:39 +0200)]
mod_adhoc: Always allow at least the "complete" action

12 years agonet.http.{server|codes|parser}: Initial commit.
Waqas Hussain [Sat, 7 Apr 2012 23:09:33 +0000 (04:09 +0500)]
net.http.{server|codes|parser}: Initial commit.

12 years agomod_s2s: Queuing a stanza constitutes handling it.
Paul Aurich [Tue, 27 Mar 2012 02:17:09 +0000 (19:17 -0700)]
mod_s2s: Queuing a stanza constitutes handling it.

12 years agomod_s2s: Add "::" as a IPv6 interface (thanks darkrain)
Florian Zeitz [Mon, 26 Mar 2012 16:23:49 +0000 (18:23 +0200)]
mod_s2s: Add "::" as a IPv6 interface (thanks darkrain)

12 years agoutil.debug: Move boundary markers to top of relevant sections of the stack trace...
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)

12 years agoutil.debug: Add a touch of colour to source locations
Matthew Wild [Thu, 22 Mar 2012 16:39:28 +0000 (16:39 +0000)]
util.debug: Add a touch of colour to source locations

12 years agoutil.debug: Add a bit of colour
Matthew Wild [Thu, 22 Mar 2012 16:07:57 +0000 (16:07 +0000)]
util.debug: Add a bit of colour

12 years agoutil.debug: Move optimal line length (default 65) into a variable
Matthew Wild [Thu, 22 Mar 2012 15:10:38 +0000 (15:10 +0000)]
util.debug: Move optimal line length (default 65) into a variable

12 years agoutil.debug: Add markers in the output when crossing source file boundaries
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

12 years agoutil.debug: Add catch for an "error in error handling"
Matthew Wild [Thu, 22 Mar 2012 15:08:21 +0000 (15:08 +0000)]
util.debug: Add catch for an "error in error handling"

12 years agoutil.debug: Attempt to get debug.traceback() parameter handling correct (again)
Matthew Wild [Thu, 22 Mar 2012 15:07:27 +0000 (15:07 +0000)]
util.debug: Attempt to get debug.traceback() parameter handling correct (again)

12 years agoMakefile: Use cp instead of install, and make sure the correct umask is set
Kim Alvefur [Tue, 20 Mar 2012 11:50:53 +0000 (12:50 +0100)]
Makefile: Use cp instead of install, and make sure the correct umask is set

12 years agologgingmanager, util.logger: Remove name sinks and the ability to filter logs by...
Matthew Wild [Thu, 15 Mar 2012 19:09:24 +0000 (19:09 +0000)]
loggingmanager, util.logger: Remove name sinks and the ability to filter logs by source name (lots of code, hardly used if at all, and possibly broken)

12 years agomod_c2s: Add missing multiplexed service discovery pattern.
Kim Alvefur [Thu, 15 Mar 2012 16:37:07 +0000 (17:37 +0100)]
mod_c2s: Add missing multiplexed service discovery pattern.

12 years agomod_c2s, mod_s2s: Drop default_port and default_mode from listener objects (default_p...
Matthew Wild [Thu, 15 Mar 2012 16:31:10 +0000 (16:31 +0000)]
mod_c2s, mod_s2s: Drop default_port and default_mode from listener objects (default_port is deprecated, and default_mode already defaults to *a)

12 years agoportmanager: Support 'default_port' in service options
Matthew Wild [Thu, 15 Mar 2012 16:29:30 +0000 (16:29 +0000)]
portmanager: Support 'default_port' in service options

12 years agomod_posix, mod_bosh, mod_admin_telnet: Use module:set_global()
Kim Alvefur [Thu, 15 Mar 2012 13:47:46 +0000 (14:47 +0100)]
mod_posix, mod_bosh, mod_admin_telnet: Use module:set_global()

12 years agoMerge with Zash
Matthew Wild [Thu, 15 Mar 2012 03:19:35 +0000 (03:19 +0000)]
Merge with Zash

12 years agomod_c2s, mod_s2s: Add multiplex support
Matthew Wild [Thu, 15 Mar 2012 03:05:24 +0000 (03:05 +0000)]
mod_c2s, mod_s2s: Add multiplex support

12 years agomod_net_multiplex: Port multiplexing (run multiple different services on a the same...
Matthew Wild [Thu, 15 Mar 2012 03:05:02 +0000 (03:05 +0000)]
mod_net_multiplex: Port multiplexing (run multiple different services on a the same port(s))... now pluggable for use with any net plugin

12 years agoportmanager: Add get_registered_services() to the public API
Matthew Wild [Thu, 15 Mar 2012 03:02:51 +0000 (03:02 +0000)]
portmanager: Add get_registered_services() to the public API

12 years agoportmanager: Remove check for service_info.multiplex (now implemented in mod_net_mult...
Matthew Wild [Thu, 15 Mar 2012 03:02:36 +0000 (03:02 +0000)]
portmanager: Remove check for service_info.multiplex (now implemented in mod_net_multiplex)

12 years agoportmanager: Fix pre-0.9 compatibility by taking default_interface and default_port...
Matthew Wild [Thu, 15 Mar 2012 03:02:09 +0000 (03:02 +0000)]
portmanager: Fix pre-0.9 compatibility by taking default_interface and default_port from the listener instead of service table

12 years agoportmanager: Allow services to specify their config option prefix
Matthew Wild [Thu, 15 Mar 2012 02:56:44 +0000 (02:56 +0000)]
portmanager: Allow services to specify their config option prefix

12 years agomoduleapi: Add module:send() as an alias for core_post_stanza() from the current...
Matthew Wild [Thu, 15 Mar 2012 02:53:05 +0000 (02:53 +0000)]
moduleapi: Add module:send() as an alias for core_post_stanza() from the current host's origin

12 years agomoduleapi: Add module:provides(), a shortcut to add an item with the current module...
Matthew Wild [Thu, 15 Mar 2012 02:52:31 +0000 (02:52 +0000)]
moduleapi: Add module:provides(), a shortcut to add an item with the current module's name

12 years agoportmanager: Fire service-removed on unregister
Matthew Wild [Wed, 14 Mar 2012 23:44:24 +0000 (23:44 +0000)]
portmanager: Fire service-removed on unregister

12 years agomod_s2s/s2sout.lib: Log message instead of traceback when s2s isn't configured for...
Matthew Wild [Wed, 14 Mar 2012 21:43:46 +0000 (21:43 +0000)]
mod_s2s/s2sout.lib: Log message instead of traceback when s2s isn't configured for any ports

12 years agomod_c2s: Use module:add_item() to add the net-provider for portmanager
Matthew Wild [Wed, 14 Mar 2012 21:42:08 +0000 (21:42 +0000)]
mod_c2s: Use module:add_item() to add the net-provider for portmanager

12 years agoportmanager: Fix log message when multiple services are configured to use the same...
Matthew Wild [Wed, 14 Mar 2012 21:40:14 +0000 (21:40 +0000)]
portmanager: Fix log message when multiple services are configured to use the same port

12 years agoportmanager: Support item-added/net-provider (global and shared modules only!)
Matthew Wild [Wed, 14 Mar 2012 21:39:45 +0000 (21:39 +0000)]
portmanager: Support item-added/net-provider (global and shared modules only!)

12 years agoportmanager: Add unregister_service(), and allow multiple services with the same...
Matthew Wild [Wed, 14 Mar 2012 21:39:02 +0000 (21:39 +0000)]
portmanager: Add unregister_service(), and allow multiple services with the same name (they get queued)

12 years agomodulemanager: Some refactoring. Deprecate module.host = "*", modules should call...
Matthew Wild [Wed, 14 Mar 2012 21:37:00 +0000 (21:37 +0000)]
modulemanager: Some refactoring. Deprecate module.host = "*", modules should call module:set_global() (which has been around since forever)

12 years agomoduleapi: Set module.global = true when module:set_global() is called
Matthew Wild [Wed, 14 Mar 2012 21:33:15 +0000 (21:33 +0000)]
moduleapi: Set module.global = true when module:set_global() is called

12 years agomodulemanager: Use appropriate events object for global modules when firing item...
Matthew Wild [Wed, 14 Mar 2012 17:03:48 +0000 (17:03 +0000)]
modulemanager: Use appropriate events object for global modules when firing item-removed on unload

12 years agomod_auth_internal_{plain,hashed}: Clarify log messages on initialization
Matthew Wild [Sun, 11 Mar 2012 20:56:09 +0000 (20:56 +0000)]
mod_auth_internal_{plain,hashed}: Clarify log messages on initialization

12 years agomod_s2s: Don't bounce sendq on failed connections since it's handled by s2smanager
Kim Alvefur [Sun, 11 Mar 2012 20:37:55 +0000 (21:37 +0100)]
mod_s2s: Don't bounce sendq on failed connections since it's handled by s2smanager

12 years agomod_s2s: Collect s2s sources from portmanager and get local address if necessary
Florian Zeitz [Sun, 11 Mar 2012 19:16:57 +0000 (20:16 +0100)]
mod_s2s: Collect s2s sources from portmanager and get local address if necessary

12 years agomod_s2s: Remove obsolete default_interface
Florian Zeitz [Sun, 11 Mar 2012 19:15:42 +0000 (20:15 +0100)]
mod_s2s: Remove obsolete default_interface

12 years agoMerge with Zash
Matthew Wild [Sun, 11 Mar 2012 19:13:29 +0000 (19:13 +0000)]
Merge with Zash

12 years agoportmanager: Add get_active_services()
Matthew Wild [Sun, 11 Mar 2012 18:35:27 +0000 (18:35 +0000)]
portmanager: Add get_active_services()

12 years agos2smanager, mod_s2s: Move import of dns_max_depth to mod_s2s
Kim Alvefur [Sun, 11 Mar 2012 18:14:28 +0000 (19:14 +0100)]
s2smanager, mod_s2s: Move import of dns_max_depth to mod_s2s

12 years agoportmanager: Add get_service()
Matthew Wild [Sun, 11 Mar 2012 12:40:32 +0000 (12:40 +0000)]
portmanager: Add get_service()

12 years agoMerge 0.9->trunk
Matthew Wild [Fri, 9 Mar 2012 18:46:19 +0000 (18:46 +0000)]
Merge 0.9->trunk