aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge timber->trunk - thanks everyone!Matthew Wild2012-04-2446-2100/+2928
|\
| * net.http.server: Handle results returned by handlers, and send as a response....Matthew Wild2012-04-241-12/+20
| * net.http.server: Remove debug messageMatthew Wild2012-04-241-1/+0
| * util.helpers: Add show_events(), to show the events and handlers in a util.ev...Matthew Wild2012-04-241-0/+29
| * util.debug: Turn into a real-ish module ('debugx'), and require you call use(...Matthew Wild2012-04-241-4/+12
| * mod_proxy65: Port to portmanager, make a shared moduleMatthew Wild2012-04-241-98/+86
| * mod_http: Fix specifying method in app route keysMatthew Wild2012-04-241-3/+4
| * portmanager: Add get_service_at(interface, port) and close(interface, port)Matthew Wild2012-04-241-3/+17
| * net.server_event: Do not automatically close clients when closing a server portMatthew Wild2012-04-241-16/+3
| * net.server_select: Remove server from _server table when closingMatthew Wild2012-04-241-0/+1
| * mod_admin_telnet: Add initial port:list() and port:close() commandsMatthew Wild2012-04-241-1/+47
| * prosody: Load portmanager at startup, to ensure it is ready to receive item-a...Matthew Wild2012-04-241-0/+1
| * mod_http_files: Rename argument to reflect what it actually isKim Alvefur2012-04-241-3/+3
| * mod_httpserver: Rename to mod_http_filesKim Alvefur2012-04-231-0/+0
| * mod_httpserver: Adapt to use the new HTTP APIKim Alvefur2012-04-231-39/+28
| * mod_http: Pass portion of path that matched wildcard to wildcard handlers, as...Matthew Wild2012-04-231-0/+8
| * net.http.server: Support for wildcard events (events that end with '/*')Matthew Wild2012-04-231-0/+51
| * mod_http: Support for default_path in appsMatthew Wild2012-04-231-4/+6
| * moduleapi: Add module:add_timer(delay, callback) - automatically halts the ti...Matthew Wild2012-04-231-0/+7
| * modulemanager: Set module.loaded = false on unloadMatthew Wild2012-04-231-0/+1
| * mod_http: Revamp module for new API and configMatthew Wild2012-04-231-52/+54
| * moduleapi: module:depends(): Load shared modules onto the current host even i...Matthew Wild2012-04-231-0/+3
| * modulemanager: Report errors that happen when loading a shared module onto it...Matthew Wild2012-04-231-1/+1
| * moduleapi: module:provides(): Add "-provider" onto the key nameMatthew Wild2012-04-231-1/+1
| * moduleapi: module:provides(): Fix usage of wrong tableMatthew Wild2012-04-231-1/+1
| * net.http.server: Fix legacy net.httpserver fallback (httpserver is no longer ...Waqas Hussain2012-04-221-2/+3
| * net.httpserver: Comment dependency on connlisteners. Further cleanup to follow.Waqas Hussain2012-04-221-4/+4
| * Merge with ZashMatthew Wild2012-04-221-1/+1
| |\
| | * core.certmanager: Log a message when a password is required but not supplied....Kim Alvefur2012-04-211-1/+1
| * | mod_component: Handle component connecting to non-existent hostMatthew Wild2012-04-221-1/+1
| * | mod_motd: Use presence/bare to catch a client's initial presence and send the...Matthew Wild2012-04-221-9/+10
| * | multiplex_listener: Remove (already ported to mod_net_multiplex)Matthew Wild2012-04-211-50/+0
| * | modulemanager: For children of shared modules, set module.environment to the ...Matthew Wild2012-04-211-0/+1
| * | moduleapi: Have modules internally store a reference to shared tables they us...Matthew Wild2012-04-211-0/+2
| * | mod_component: Make a shared module, and move the xmppcomponent_listener into...Matthew Wild2012-04-212-283/+268
| |/
| * mod_motd: Send only to resource coming online, not the user's bare JID (fixes...Matthew Wild2012-04-211-3/+3
| * prosody: Don't require net.httpserver nowMatthew Wild2012-04-211-2/+0
| * mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors wh...Matthew Wild2012-04-211-4/+10
| * mod_admin_telnet: module:list(): List global modules (part-fixes #228)Matthew Wild2012-04-211-2/+3
| * mod_admin_telnet: module:reload(): If module is loaded on *, reload it there ...Matthew Wild2012-04-211-3/+7
| * mod_admin_telnet: get_host_set(): Include '*' in the set if no specific hosts...Matthew Wild2012-04-211-1/+5
| * modulemanager: When a shared module becomes global, ensure it still gets load...Matthew Wild2012-04-211-2/+4
| * modulemanager: Support for shared modules - function module.add_host(host_mod...Matthew Wild2012-04-211-0/+15
| * modulemanager: Make module_has_method and module_call_method use rawget()Matthew Wild2012-04-211-3/+3
| * modulemanager: Use modulemap rather than hosts[host] (fix for when host == "*")Matthew Wild2012-04-211-1/+1
| * modulemanager: Use api_instance rather than pluginenv.module (same thing)Matthew Wild2012-04-211-3/+3
| * modulemanager: Allow loading a module onto "*" (part-fixes #228)Matthew Wild2012-04-211-2/+4
| * net.connlisteners: Be gone!Matthew Wild2012-04-211-81/+0
| * mod_http: Include handlers of non-global modules.Waqas Hussain2012-04-211-12/+28
| * mod_http: Provide HTTP service.Waqas Hussain2012-04-211-0/+69