aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* prosodyctl: Fix import of util.iteratorsKim Alvefur2012-05-041-1/+1
* Rename plugins/s2s/ to plugins/mod_s2s/Matthew Wild2012-05-042-0/+0
* sessionmanager: Remove max_resources config option and check, incorrect anywa...Matthew Wild2012-05-031-4/+0
* util.timer: Remove unnecessary require calls, fixes a traceback (thanks nulani)Matthew Wild2012-05-031-2/+2
* net.server: server_select != server_event (thanks Nulani, Florob)Matthew Wild2012-05-031-1/+1
* Merge with ZashMatthew Wild2012-05-031-1/+1
|\
| * portmanager: Import pairsKim Alvefur2012-05-031-1/+1
* | net.server, net.timer, net.server_select: Rearrange dependencies between thes...Matthew Wild2012-05-033-23/+9
* | mod_admin_telnet: Add muc:room(jid) command to get the MUC room objectMatthew Wild2012-05-021-1/+25
|/
* mod_component: Allow unauthenticated components to authenticate (thanks Maranda)Matthew Wild2012-04-301-1/+1
* mod_component: Components start out as component_unauthed until successful au...Matthew Wild2012-04-301-1/+2
* modulemanager: Pass the module's final host (e.g. '*') to the module-loaded e...Matthew Wild2012-04-301-1/+1
* mod_component: Send <?xml on initial stream (thanks xnyhps)Matthew Wild2012-04-301-0/+1
* util.xmlrpc: Remove (unused)Matthew Wild2012-04-291-182/+0
* modulemanager: Hide deprecation warning for modules loaded on '*' directly (e...Matthew Wild2012-04-291-1/+3
* portmanager: Import ipairs (thanks Maranda)Matthew Wild2012-04-291-1/+1
* Merge with ZashMatthew Wild2012-04-291-1/+1
|\
| * mod_s2s: Don't try to continue attempting to connect when an s2sin is closedKim Alvefur2012-04-291-1/+1
* | Merge 0.9->trunkMatthew Wild2012-04-2981-2595/+4065
|\|
| * net.connlisteners: Add COMPAT stub, use portmanager!Matthew Wild2012-04-281-0/+15
| * s2sout.lib: Check whether lua-socket supports IPv6Florian Zeitz2012-04-281-0/+4
| * moduleapi: Add module:get_directory() to get module file's directory, and mod...Matthew Wild2012-04-281-0/+10
| * portmanager: Import tonumber (thanks Zash)Matthew Wild2012-04-281-1/+1
| * net.http.server: Code cleanup/adjustment now that send_response() accepts res...Matthew Wild2012-04-281-3/+1
| * net.http.server: Use response.body if it exists and body is not specified to ...Matthew Wild2012-04-281-1/+1
| * portmanager: Ensure port is always a number (thanks Zash)Matthew Wild2012-04-281-0/+1
| * mod_muc/muc.lib: Fall back to default_history_length if no length in configMatthew Wild2012-04-281-1/+1
| * net.httpserver: Add compatibility stubMatthew Wild2012-04-281-0/+15
| * mod_s2s: Log certificate errors, for troubleshooting goodnessPaul Aurich2012-04-281-0/+3
| * mod_s2s: Fix import of core_process_stanza. I don't know why I thought it was...Matthew Wild2012-04-281-1/+1
| * Merge with ZashMatthew Wild2012-04-281-0/+10
| |\
| | * mod_admin_telnet: Add c2s:count() which shows number of connected users.Kim Alvefur2012-04-281-0/+10
| * | mod_admin_adhoc: Small style fixMatthew Wild2012-04-281-1/+1
| * | util.debug: Add +1 to level when getting locals table, to account for current...Matthew Wild2012-04-281-1/+1
| * | util.debug: Re-fix parameter handling (I think it matches debug.traceback() m...Matthew Wild2012-04-281-11/+16
| |/
| * modulemanager: Fixes to handle circular dependencies in module:depends()Matthew Wild2012-04-281-3/+9
| * prosody.cfg.lua.dist: Rename mod_httpserver to mod_http_files, and move both ...Matthew Wild2012-04-281-2/+4
| * mod_http: Depend on mod_http_errorsMatthew Wild2012-04-281-0/+1
| * usermanager: Add log error for use of COMPAT config option 'anonymous_login'....Matthew Wild2012-04-281-1/+4
| * util.httpstream: Remove COMPAT properties from requestMatthew Wild2012-04-281-3/+0
| * net.http.server: Remove unused imports and variables (fixes traceback due to ...Matthew Wild2012-04-281-4/+2
| * net.httpserver, net.httpserver_listener: Remove (obsoleted by net.http.* and ...Matthew Wild2012-04-282-284/+0
| * mod_bosh: Remove unused send_buffer variableMatthew Wild2012-04-281-1/+1
| * mod_bosh: Fix request/response mixupMatthew Wild2012-04-281-1/+1
| * mod_bosh: Remove unused import of util.timerMatthew Wild2012-04-281-1/+0
| * mod_muc/muc.lib.lua: Remove unused imports and variablesMatthew Wild2012-04-281-5/+0
| * mod_auth_anonymous: Remove unused logger initMatthew Wild2012-04-281-1/+0
| * mod_auth_internal_hashed: Remove COMPAT code (upgrading old hashed storage fo...Matthew Wild2012-04-281-24/+0
| * mod_auth_internal_hashed: Remove unused importsMatthew Wild2012-04-281-9/+0
| * mod_auth_internal_plain: Remove unused importsMatthew Wild2012-04-281-9/+1