|
Merge backout
|
Matthew Wild |
Fri, 24 Feb 2012 16:25:45 +0000 |
|
Backed out changeset aba47e6dff43
|
Matthew Wild |
Fri, 24 Feb 2012 16:25:38 +0000 |
|
Merge Zash with Florob and Maranda
|
Matthew Wild |
Fri, 24 Feb 2012 16:23:46 +0000 |
|
mod_s2s: prevent attempting to reconnect when the stream is gracefully closed and fix TB by checking session.conn is set (racy racy?)
|
Marco Cirillo |
Fri, 24 Feb 2012 15:36:36 +0000 |
|
mod_admin_telnet: make service private.
|
Marco Cirillo |
Fri, 24 Feb 2012 15:35:04 +0000 |
|
mod_s2s, s2sout.lib: import cert verify and add another fallback method in case socket.local_addresses isn't there.
|
Marco Cirillo |
Fri, 24 Feb 2012 15:34:25 +0000 |
|
s2sout.lib: import utils/functionality once in s2smanager.
|
Florian Zeitz |
Fri, 24 Feb 2012 15:24:10 +0000 |
|
mod_s2s: port functionality once in s2smanager.
|
Florian Zeitz |
Fri, 24 Feb 2012 15:21:21 +0000 |
|
mod_dialback: import util.hashes and functionality once in s2smanager.
|
Florian Zeitz |
Fri, 24 Feb 2012 15:20:03 +0000 |
|
s2smanager: remove send_to_host.
|
Florian Zeitz |
Fri, 24 Feb 2012 15:15:43 +0000 |
|
modulemanager: include mod_c2s and mod_s2s into autoloaded modules.
|
Florian Zeitz |
Fri, 24 Feb 2012 15:14:07 +0000 |
|
s2sout.lib: Fix wrong variable name
|
Kim Alvefur |
Thu, 23 Feb 2012 23:12:24 +0100 |
|
s2sout.lib: Add locals for source interfaces
|
Kim Alvefur |
Thu, 23 Feb 2012 23:12:08 +0100 |
|
s2sout.lib: Import various util.*
|
Kim Alvefur |
Thu, 23 Feb 2012 23:09:09 +0100 |
|
mod_s2s: Attach send function to session
|
Kim Alvefur |
Thu, 23 Feb 2012 23:04:59 +0100 |
|
mod_s2s: Initiate connections
|
Kim Alvefur |
Thu, 23 Feb 2012 23:03:28 +0100 |
|
mod_s2s: Fix typo
|
Kim Alvefur |
Wed, 22 Feb 2012 23:14:21 +0100 |
|
mod_s2s: Add some missing imports
|
Kim Alvefur |
Wed, 22 Feb 2012 23:12:57 +0100 |
|
net.http, httpclient_listener: Merge listener into net.http
|
Matthew Wild |
Mon, 23 Jan 2012 17:19:16 +0000 |
|
xmppserver_listener: Remove
|
Matthew Wild |
Mon, 23 Jan 2012 17:12:05 +0000 |
|
s2smanager, mod_s2s, mod_s2s/s2sout: Split connection handling out of s2smanager into mod_s2s, and further split connection logic for s2sout to a module lib, s2sout.lib.lua
|
Matthew Wild |
Mon, 23 Jan 2012 16:28:20 +0000 |
|
stanza_router: Replace s2s send logic with firing of a 'route/remote' event
|
Matthew Wild |
Mon, 23 Jan 2012 16:25:21 +0000 |
|
stanza_router: Remove obsolete commented code
|
Matthew Wild |
Mon, 23 Jan 2012 16:24:06 +0000 |
|
sessionmanager: Require uuid_generate()
|
Matthew Wild |
Mon, 23 Jan 2012 02:23:23 +0000 |
|
mod_c2s: Code reduction
|
Matthew Wild |
Mon, 23 Jan 2012 02:15:28 +0000 |
|
mod_admin_telnet: Port to portmanager
|
Matthew Wild |
Mon, 23 Jan 2012 01:05:32 +0000 |
|
prosody: sandboxed require(): Point __index of _G at current env for modules that need to reference globals they already set
|
Matthew Wild |
Mon, 23 Jan 2012 01:04:15 +0000 |
|
sessionmanager, mod_c2s: Move timeout logic to mod_c2s
|
Matthew Wild |
Mon, 23 Jan 2012 00:56:57 +0000 |
|
prosody: Remove connlisteners, and net_activate_ports
|
Matthew Wild |
Mon, 23 Jan 2012 00:11:01 +0000 |
|
portmanager: Pass port to friendly_error_message()
|
Matthew Wild |
Mon, 23 Jan 2012 00:07:15 +0000 |
|
util.iterators: Make a standard library (no longer injects into global namespace)
|
Matthew Wild |
Mon, 23 Jan 2012 00:00:10 +0000 |
|
util.set: Accept nil to add_list()
|
Matthew Wild |
Sun, 22 Jan 2012 23:59:19 +0000 |
|
mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s
|
Matthew Wild |
Sun, 22 Jan 2012 23:57:13 +0000 |
|
portmanager: One manager to, in the darkness, bind them
|
Matthew Wild |
Sun, 22 Jan 2012 23:55:48 +0000 |
|
Merge with trunk
|
Matthew Wild |
Sun, 22 Jan 2012 22:55:49 +0000 |
|
mod_admin_telnet: Use module:shared() to expose commands table and default console environment
|
Matthew Wild |
Sun, 22 Jan 2012 19:50:08 +0000 |
|
moduleapi: Add module:shared(), a way to easily share data between multiple loaded modules
|
Matthew Wild |
Sun, 22 Jan 2012 19:48:53 +0000 |
|
moduleapi: Add module:depends(), a way to safely depend upon another module at runtime
|
Matthew Wild |
Sun, 22 Jan 2012 19:35:50 +0000 |
|
modulemanager: load(): Return and use the correct module object
|
Matthew Wild |
Sun, 22 Jan 2012 19:27:06 +0000 |
|
util.helpers: After nearly 'fixing' this code, I conclude it instead only deserves a bigger smile
|
Matthew Wild |
Sun, 22 Jan 2012 19:10:13 +0000 |
|
modulemanager: Cleanup some unused variables, imports, whitespace and add a comment.
|
Matthew Wild |
Sun, 22 Jan 2012 18:49:49 +0000 |
|
modulemanager, moduleapi: Replace hooks multitable with an event_handlers map stored in individual modules. Also adds module:hook_object_event() to hook events on any util.events compatible object.
|
Matthew Wild |
Sun, 22 Jan 2012 18:49:11 +0000 |
|
modulemanager: Drop unnecessary prosody_events local
|
Matthew Wild |
Sun, 22 Jan 2012 18:47:33 +0000 |
|
modulemanager: Some reorganisation. Only external change is (should be) that module-unloaded and module-loaded are no longer fired when reloading a module, the new event module-reloaded is fired instead.
|
Matthew Wild |
Sun, 22 Jan 2012 18:46:17 +0000 |
|
modulemanager: Move in-module API functions to core.moduleapi (half the file size, yay)
|
Matthew Wild |
Sun, 22 Jan 2012 18:41:55 +0000 |
|
configmanager: get(): Make section (core) optional (hurrah)
|
Matthew Wild |
Sat, 10 Dec 2011 17:21:19 +0000 |
|
Merge with Markus Kötter
|
Matthew Wild |
Tue, 24 Apr 2012 03:23:44 +0100 |
|
muc - implement per channel history limits
|
Markus Kötter |
Fri, 13 Apr 2012 21:23:26 +0200 |
|
Merge with 0.9
|
Matthew Wild |
Thu, 19 Apr 2012 19:35:10 +0100 |
|
mod_bosh: Log error on BOSH parse failure (thanks daurnimator)
|
Matthew Wild |
Thu, 19 Apr 2012 19:30:47 +0100 |
|
util.debug: Move boundary markers to top of relevant sections of the stack trace (easier to follow)
|
Matthew Wild |
Thu, 22 Mar 2012 16:51:39 +0000 |
|
util.debug: Add a touch of colour to source locations
|
Matthew Wild |
Thu, 22 Mar 2012 16:39:28 +0000 |
|
util.debug: Add a bit of colour
|
Matthew Wild |
Thu, 22 Mar 2012 16:07:57 +0000 |
|
util.debug: Move optimal line length (default 65) into a variable
|
Matthew Wild |
Thu, 22 Mar 2012 15:10:38 +0000 |
|
util.debug: Add markers in the output when crossing source file boundaries
|
Matthew Wild |
Thu, 22 Mar 2012 15:09:37 +0000 |
|
util.debug: Add catch for an "error in error handling"
|
Matthew Wild |
Thu, 22 Mar 2012 15:08:21 +0000 |
|
util.debug: Attempt to get debug.traceback() parameter handling correct (again)
|
Matthew Wild |
Thu, 22 Mar 2012 15:07:27 +0000 |
|
Merge 0.9->trunk
|
Matthew Wild |
Fri, 09 Mar 2012 18:46:19 +0000 |
|
mod_admin_telnet: Add flag for IPv6
|
Kim Alvefur |
Mon, 05 Mar 2012 22:11:29 +0100 |
|
mod_admin_telnet: Add flag for stream management.
|
Kim Alvefur |
Mon, 05 Mar 2012 22:11:05 +0100 |
|
mod_admin_telnet: (encrypted) is redundant in combination with (secure)
|
Kim Alvefur |
Mon, 05 Mar 2012 22:10:09 +0100 |
|
mod_admin_telnet: Commond and flexible way to show stream properties.
|
Kim Alvefur |
Mon, 05 Mar 2012 22:07:40 +0100 |
|
core.s2smanager: Log the entire stream header.
|
Kim Alvefur |
Sun, 04 Mar 2012 17:38:47 +0100 |
|
Merge with 0.9
|
Matthew Wild |
Sat, 25 Feb 2012 17:21:15 +0000 |
|
core.s2smanager: Fix check_cert_status() for when the stream has no from attr
|
Kim Alvefur |
Tue, 21 Feb 2012 21:13:13 +0100 |
|
s2smanager: Fix traceback when socket.tcp6 isn't available
|
Matthew Wild |
Sat, 25 Feb 2012 02:03:26 +0000 |
|
Merge with 0.9
|
Matthew Wild |
Sun, 12 Feb 2012 17:55:22 +0000 |
|
hostmanager: Import select() (thanks Medics)
|
Matthew Wild |
Sun, 12 Feb 2012 17:53:50 +0000 |
|
Merge with 0.9
|
Matthew Wild |
Sun, 12 Feb 2012 14:21:09 +0000 |
|
mod_saslauth: Remove useless import of, and call to nodeprep.
|
Kim Alvefur |
Sun, 12 Feb 2012 15:14:35 +0100 |
|
mod_saslauth: Fire authentication-failure if make_authenticated() failed.
|
Kim Alvefur |
Sun, 12 Feb 2012 15:08:12 +0100 |
|
mod_saslauth: Move authentication-success event to after session has been made authenticated.
|
Kim Alvefur |
Sun, 12 Feb 2012 15:05:31 +0100 |
|
Merge with 0.9
|
Matthew Wild |
Sat, 11 Feb 2012 14:51:29 +0000 |
|
hostmanager: Import jid_split (thanks chris)
|
Matthew Wild |
Sat, 11 Feb 2012 14:51:00 +0000 |
|
util.prosodyctl: Fix variable name clash introduced in 55ef5d83d00a (thanks chris)
|
Matthew Wild |
Sat, 11 Feb 2012 14:49:51 +0000 |
|
Merge with 0.9
|
Matthew Wild |
Wed, 08 Feb 2012 16:20:07 +0100 |
|
util.prosodyctl: In the register command, check that the virtual exists before proceeding.
|
Kim Alvefur |
Wed, 08 Feb 2012 15:33:36 +0100 |
|
hostmanager: Add send() method to hosts
|
Matthew Wild |
Fri, 16 Dec 2011 16:01:59 +0000 |
|
prosody.cfg.lua.dist: Comment mod_legacyauth by default (thanks Zash)
|
Matthew Wild |
Tue, 31 Jan 2012 22:41:21 +0000 |
|
tools/ejabberdsql2prosody: Handle INSERT statement form where column list is specified (by skipping the column list).
|
Waqas Hussain |
Sun, 05 Feb 2012 00:10:13 +0500 |
|
util.template: Refactoring to make the string->stanza conversion code more generic.
|
Waqas Hussain |
Sun, 05 Feb 2012 00:06:20 +0500 |
|
Merge with 0.9
|
Matthew Wild |
Thu, 26 Jan 2012 18:48:21 +0000 |
|
s2smanager: Log the host when marking it authenticated
|
Paul Aurich |
Tue, 24 Jan 2012 14:58:54 -0800 |
|
mod_saslauth: "" ~= nil (thanks, Zash!)
|
Paul Aurich |
Tue, 24 Jan 2012 14:57:53 -0800 |
|
util.json: Added function encode_ordered(object).
|
Waqas Hussain |
Wed, 18 Jan 2012 08:54:26 +0500 |
|
util.dataforms: Fix verfication for booleans
|
Florian Zeitz |
Sat, 03 Dec 2011 17:10:48 +0100 |
|
util.dataforms: Fix form verification
|
Florian Zeitz |
Fri, 02 Dec 2011 19:24:54 +0100 |
|
Merge with Zash
|
Matthew Wild |
Thu, 26 Jan 2012 18:47:59 +0000 |
|
prosodyctl: Add commands for generating certificates and keys
|
Kim Alvefur |
Fri, 20 Jan 2012 22:04:28 +0100 |
|
user.x509: Add some utility functions for generating OpenSSL configs
|
Kim Alvefur |
Fri, 20 Jan 2012 21:59:13 +0100 |
|
util.prosodyctl: Add getline() and show_prompt()
|
Kim Alvefur |
Fri, 20 Jan 2012 21:58:04 +0100 |
|
util.xmppstream: Optimize attribute processing.
|
Waqas Hussain |
Wed, 25 Jan 2012 11:54:12 +0500 |
|
util.xmppstream: Have faith in the XML parser matching start and end tags.
|
Waqas Hussain |
Wed, 25 Jan 2012 11:49:27 +0500 |
|
util.xmppstream: Remove some unnecessary code.
|
Waqas Hussain |
Wed, 25 Jan 2012 11:47:51 +0500 |
|
mod_compression: Change default compression level to 7
|
Kim Alvefur |
Thu, 19 Jan 2012 16:47:12 +0100 |
|
mod_compression: Use get_option_number
|
Kim Alvefur |
Thu, 19 Jan 2012 16:38:04 +0100 |
|
Merge with trunk
|
Matthew Wild |
Wed, 18 Jan 2012 15:08:05 +0000 |
|
Merge with 0.9
|
Matthew Wild |
Wed, 18 Jan 2012 15:07:40 +0000 |
|
mod_watchregistrations: Fixed an undefined global access (thanks Medics).
|
Waqas Hussain |
Mon, 12 Dec 2011 14:53:12 +0500 |
|
prosodyctl: Adjust description of 'reload' command (thanks crocket)
|
Matthew Wild |
Tue, 17 Jan 2012 21:10:16 +0000 |
|
mod_tls: Fix log statement (thanks Zash)
|
Matthew Wild |
Wed, 18 Jan 2012 15:07:26 +0000 |
|
util.json: Added function encode_ordered(object).
|
Waqas Hussain |
Wed, 18 Jan 2012 08:54:26 +0500 |
|
xmppserver_listener: Only re-attempt connection on disconnect if it was an unauthenticated s2sout (thanks Medics for the log)
|
Matthew Wild |
Tue, 17 Jan 2012 17:56:36 +0000 |
|
Merge with 0.9
|
Matthew Wild |
Tue, 17 Jan 2012 00:31:30 +0000 |
|
net.http: Pass response object to callbacks (feels hacky, should this be passed *instead of* the request?)
|
Matthew Wild |
Tue, 17 Jan 2012 00:30:52 +0000 |
|
util.throttle: Fix 'outstanding' return value
|
Matthew Wild |
Fri, 13 Jan 2012 23:30:32 +0000 |
|
util.throttle: Import setmetatable
|
Matthew Wild |
Fri, 13 Jan 2012 23:30:00 +0000 |
|
net.server_event: Fix :pause() to actually stop reading from the socket, rather than ignoring socket-readable events (!), and :resume() to restart the event listener
|
Matthew Wild |
Mon, 16 Jan 2012 04:44:23 +0000 |
|
util.throttle: Fix 'outstanding' return value
|
Matthew Wild |
Fri, 13 Jan 2012 23:30:32 +0000 |
|
util.throttle: Import setmetatable
|
Matthew Wild |
Fri, 13 Jan 2012 23:30:00 +0000 |
|
util.debug: Adjust level within get_locals_table() to account for the additional depth of this function itself
|
Matthew Wild |
Fri, 13 Jan 2012 15:46:36 +0000 |
|
mod_component: removed unused variable reference, added "flagging" to assert if a component is connected or not.
|
Marco Cirillo |
Fri, 06 Jan 2012 21:45:33 +0000 |
