Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge backout | Matthew Wild | 2012-02-24 | 1 | -2/+2 | |
|\ | ||||||
| * | Backed out changeset aba47e6dff43 | Matthew Wild | 2012-02-24 | 1 | -2/+2 | |
| | | ||||||
* | | Merge Zash with Florob and Maranda | Matthew Wild | 2012-02-24 | 6 | -25/+37 | |
|\| | ||||||
| * | mod_s2s: prevent attempting to reconnect when the stream is gracefully ↵ | Marco Cirillo | 2012-02-24 | 1 | -2/+2 | |
| | | | | | | | | closed and fix TB by checking session.conn is set (racy racy?) | |||||
| * | mod_admin_telnet: make service private. | Marco Cirillo | 2012-02-24 | 1 | -0/+1 | |
| | | ||||||
| * | mod_s2s, s2sout.lib: import cert verify and add another fallback method in ↵ | Marco Cirillo | 2012-02-24 | 2 | -1/+2 | |
| | | | | | | | | case socket.local_addresses isn't there. | |||||
| * | s2sout.lib: import utils/functionality once in s2smanager. | Florian Zeitz | 2012-02-24 | 1 | -2/+14 | |
| | | ||||||
| * | mod_s2s: port functionality once in s2smanager. | Florian Zeitz | 2012-02-24 | 1 | -2/+5 | |
| | | ||||||
| * | mod_dialback: import util.hashes and functionality once in s2smanager. | Florian Zeitz | 2012-02-24 | 1 | -7/+23 | |
| | | ||||||
| * | s2smanager: remove send_to_host. | Florian Zeitz | 2012-02-24 | 1 | -4/+1 | |
| | | ||||||
| * | modulemanager: include mod_c2s and mod_s2s into autoloaded modules. | Florian Zeitz | 2012-02-24 | 1 | -1/+1 | |
| | | ||||||
* | | s2sout.lib: Fix wrong variable name | Kim Alvefur | 2012-02-23 | 1 | -1/+1 | |
| | | ||||||
* | | s2sout.lib: Add locals for source interfaces | Kim Alvefur | 2012-02-23 | 1 | -0/+3 | |
| | | ||||||
* | | s2sout.lib: Import various util.* | Kim Alvefur | 2012-02-23 | 1 | -0/+6 | |
| | | ||||||
* | | mod_s2s: Attach send function to session | Kim Alvefur | 2012-02-23 | 1 | -0/+3 | |
| | | ||||||
* | | mod_s2s: Initiate connections | Kim Alvefur | 2012-02-23 | 1 | -0/+1 | |
| | | ||||||
* | | mod_s2s: Fix typo | Kim Alvefur | 2012-02-22 | 1 | -1/+1 | |
| | | ||||||
* | | mod_s2s: Add some missing imports | Kim Alvefur | 2012-02-22 | 1 | -0/+3 | |
|/ | ||||||
* | net.http, httpclient_listener: Merge listener into net.http | Matthew Wild | 2012-01-23 | 2 | -71/+47 | |
| | ||||||
* | xmppserver_listener: Remove | Matthew Wild | 2012-01-23 | 1 | -209/+0 | |
| | ||||||
* | s2smanager, mod_s2s, mod_s2s/s2sout: Split connection handling out of ↵ | Matthew Wild | 2012-01-23 | 3 | -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' event | Matthew Wild | 2012-01-23 | 1 | -16/+7 | |
| | ||||||
* | stanza_router: Remove obsolete commented code | Matthew Wild | 2012-01-23 | 1 | -5/+0 | |
| | ||||||
* | sessionmanager: Require uuid_generate() | Matthew Wild | 2012-01-23 | 1 | -0/+1 | |
| | ||||||
* | mod_c2s: Code reduction | Matthew Wild | 2012-01-23 | 1 | -3/+2 | |
| | ||||||
* | mod_admin_telnet: Port to portmanager | Matthew Wild | 2012-01-23 | 1 | -5/+5 | |
| | ||||||
* | prosody: sandboxed require(): Point __index of _G at current env for modules ↵ | Matthew Wild | 2012-01-23 | 1 | -1/+5 | |
| | | | | that need to reference globals they already set | |||||
* | sessionmanager, mod_c2s: Move timeout logic to mod_c2s | Matthew Wild | 2012-01-23 | 2 | -10/+11 | |
| | ||||||
* | prosody: Remove connlisteners, and net_activate_ports | Matthew Wild | 2012-01-23 | 1 | -72/+0 | |
| | ||||||
* | portmanager: Pass port to friendly_error_message() | Matthew Wild | 2012-01-23 | 1 | -2/+2 | |
| | ||||||
* | util.iterators: Make a standard library (no longer injects into global ↵ | Matthew Wild | 2012-01-23 | 1 | -11/+14 | |
| | | | | namespace) | |||||
* | util.set: Accept nil to add_list() | Matthew Wild | 2012-01-22 | 1 | -2/+4 | |
| | ||||||
* | mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and ↵ | Matthew Wild | 2012-01-22 | 2 | -90/+86 | |
| | | | | stream logic into a new module, mod_c2s | |||||
* | portmanager: One manager to, in the darkness, bind them | Matthew Wild | 2012-01-22 | 1 | -0/+132 | |
| | ||||||
* | Merge with trunk | Matthew Wild | 2012-01-22 | 30 | -388/+559 | |
|\ | ||||||
| * | mod_admin_telnet: Use module:shared() to expose commands table and default ↵ | Matthew Wild | 2012-01-22 | 1 | -4/+2 | |
| | | | | | | | | console environment | |||||
| * | moduleapi: Add module:shared(), a way to easily share data between multiple ↵ | Matthew Wild | 2012-01-22 | 1 | -0/+23 | |
| | | | | | | | | loaded modules | |||||
| * | moduleapi: Add module:depends(), a way to safely depend upon another module ↵ | Matthew Wild | 2012-01-22 | 1 | -0/+29 | |
| | | | | | | | | at runtime | |||||
| * | modulemanager: load(): Return and use the correct module object | Matthew Wild | 2012-01-22 | 1 | -2/+2 | |
| | | ||||||
| * | util.helpers: After nearly 'fixing' this code, I conclude it instead only ↵ | Matthew Wild | 2012-01-22 | 1 | -1/+1 | |
| | | | | | | | | deserves a bigger smile | |||||
| * | modulemanager: Cleanup some unused variables, imports, whitespace and add a ↵ | Matthew Wild | 2012-01-22 | 1 | -3/+1 | |
| | | | | | | | | comment. | |||||
| * | modulemanager, moduleapi: Replace hooks multitable with an event_handlers ↵ | Matthew Wild | 2012-01-22 | 2 | -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 local | Matthew Wild | 2012-01-22 | 1 | -3/+1 | |
| | | ||||||
| * | modulemanager: Some reorganisation. Only external change is (should be) that ↵ | Matthew Wild | 2012-01-22 | 1 | -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 Wild | 2012-01-22 | 2 | -212/+240 | |
| | | | | | | | | size, yay) | |||||
| * | mod_compression: Change default compression level to 7 | Kim Alvefur | 2012-01-19 | 1 | -1/+1 | |
| | | ||||||
| * | mod_compression: Use get_option_number | Kim Alvefur | 2012-01-19 | 1 | -5/+1 | |
| | | ||||||
| * | Merge with trunk | Matthew Wild | 2012-01-18 | 1 | -6/+25 | |
| |\ | ||||||
| | * | util.json: Added function encode_ordered(object). | Waqas Hussain | 2012-01-18 | 1 | -6/+25 | |
| | | | ||||||
| * | | Merge with 0.9 | Matthew Wild | 2012-01-18 | 1 | -1/+1 | |
| |\ \ |