aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge Zash with Florob and MarandaMatthew Wild2012-02-246-25/+37
| |\|
| | * mod_s2s: prevent attempting to reconnect when the stream is gracefully ↵Marco Cirillo2012-02-241-2/+2
| | | | | | | | | | | | closed and fix TB by checking session.conn is set (racy racy?)
| | * mod_admin_telnet: make service private.Marco Cirillo2012-02-241-0/+1
| | |
| | * mod_s2s, s2sout.lib: import cert verify and add another fallback method in ↵Marco Cirillo2012-02-242-1/+2
| | | | | | | | | | | | case socket.local_addresses isn't there.
| | * s2sout.lib: import utils/functionality once in s2smanager.Florian Zeitz2012-02-241-2/+14
| | |
| | * mod_s2s: port functionality once in s2smanager.Florian Zeitz2012-02-241-2/+5
| | |
| | * mod_dialback: import util.hashes and functionality once in s2smanager.Florian Zeitz2012-02-241-7/+23
| | |
| | * s2smanager: remove send_to_host.Florian Zeitz2012-02-241-4/+1
| | |
| | * modulemanager: include mod_c2s and mod_s2s into autoloaded modules.Florian Zeitz2012-02-241-1/+1
| | |
| * | s2sout.lib: Fix wrong variable nameKim Alvefur2012-02-231-1/+1
| | |
| * | s2sout.lib: Add locals for source interfacesKim Alvefur2012-02-231-0/+3
| | |
| * | s2sout.lib: Import various util.*Kim Alvefur2012-02-231-0/+6
| | |
| * | mod_s2s: Attach send function to sessionKim Alvefur2012-02-231-0/+3
| | |
| * | mod_s2s: Initiate connectionsKim Alvefur2012-02-231-0/+1
| | |
| * | mod_s2s: Fix typoKim Alvefur2012-02-221-1/+1
| | |
| * | mod_s2s: Add some missing importsKim Alvefur2012-02-221-0/+3
| |/
| * net.http, httpclient_listener: Merge listener into net.httpMatthew Wild2012-01-232-71/+47
| |
| * xmppserver_listener: RemoveMatthew Wild2012-01-231-209/+0
| |
| * s2smanager, mod_s2s, mod_s2s/s2sout: Split connection handling out of ↵Matthew Wild2012-01-233-570/+772
| | | | | | | | s2smanager into mod_s2s, and further split connection logic for s2sout to a module lib, s2sout.lib.lua
| * stanza_router: Replace s2s send logic with firing of a 'route/remote' eventMatthew Wild2012-01-231-16/+7
| |
| * stanza_router: Remove obsolete commented codeMatthew Wild2012-01-231-5/+0
| |
| * sessionmanager: Require uuid_generate()Matthew Wild2012-01-231-0/+1
| |
| * mod_c2s: Code reductionMatthew Wild2012-01-231-3/+2
| |
| * mod_admin_telnet: Port to portmanagerMatthew Wild2012-01-231-5/+5
| |
| * prosody: sandboxed require(): Point __index of _G at current env for modules ↵Matthew Wild2012-01-231-1/+5
| | | | | | | | that need to reference globals they already set
| * sessionmanager, mod_c2s: Move timeout logic to mod_c2sMatthew Wild2012-01-232-10/+11
| |
| * prosody: Remove connlisteners, and net_activate_portsMatthew Wild2012-01-231-72/+0
| |
| * portmanager: Pass port to friendly_error_message()Matthew Wild2012-01-231-2/+2
| |
| * util.iterators: Make a standard library (no longer injects into global ↵Matthew Wild2012-01-231-11/+14
| | | | | | | | namespace)
| * util.set: Accept nil to add_list()Matthew Wild2012-01-221-2/+4
| |
| * mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and ↵Matthew Wild2012-01-222-90/+86
| | | | | | | | stream logic into a new module, mod_c2s
| * portmanager: One manager to, in the darkness, bind themMatthew Wild2012-01-221-0/+132
| |
| * Merge with trunkMatthew Wild2012-01-2230-388/+559
| |\
| | * mod_admin_telnet: Use module:shared() to expose commands table and default ↵Matthew Wild2012-01-221-4/+2
| | | | | | | | | | | | console environment
| | * moduleapi: Add module:shared(), a way to easily share data between multiple ↵Matthew Wild2012-01-221-0/+23
| | | | | | | | | | | | loaded modules
| | * moduleapi: Add module:depends(), a way to safely depend upon another module ↵Matthew Wild2012-01-221-0/+29
| | | | | | | | | | | | at runtime
| | * modulemanager: load(): Return and use the correct module objectMatthew Wild2012-01-221-2/+2
| | |
| | * util.helpers: After nearly 'fixing' this code, I conclude it instead only ↵Matthew Wild2012-01-221-1/+1
| | | | | | | | | | | | deserves a bigger smile
| | * modulemanager: Cleanup some unused variables, imports, whitespace and add a ↵Matthew Wild2012-01-221-3/+1
| | | | | | | | | | | | comment.
| | * modulemanager, moduleapi: Replace hooks multitable with an event_handlers ↵Matthew Wild2012-01-222-21/+12
| | | | | | | | | | | | map stored in individual modules. Also adds module:hook_object_event() to hook events on any util.events compatible object.
| | * modulemanager: Drop unnecessary prosody_events localMatthew Wild2012-01-221-3/+1
| | |
| | * modulemanager: Some reorganisation. Only external change is (should be) that ↵Matthew Wild2012-01-221-62/+94
| | | | | | | | | | | | module-unloaded and module-loaded are no longer fired when reloading a module, the new event module-reloaded is fired instead.
| | * modulemanager: Move in-module API functions to core.moduleapi (half the file ↵Matthew Wild2012-01-222-212/+240
| | | | | | | | | | | | size, yay)
| * | configmanager: get(): Make section (core) optional (hurrah)Matthew Wild2011-12-101-0/+3
| | |
* | | Merge with Markus KötterMatthew Wild2012-04-242-7/+35
|\ \ \
| * | | muc - implement per channel history limitsMarkus Kötter2012-04-132-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | Merge with 0.9Matthew Wild2012-04-191-4/+4
|\ \ \ \
| * | | | mod_bosh: Log error on BOSH parse failure (thanks daurnimator)Matthew Wild2012-04-191-1/+4
| |/ / /
* | | | util.debug: Move boundary markers to top of relevant sections of the stack ↵Matthew Wild2012-03-221-5/+3
| | | | | | | | | | | | | | | | trace (easier to follow)
* | | | util.debug: Add a touch of colour to source locationsMatthew Wild2012-03-221-3/+4
| | | |