Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.7->trunk | Matthew Wild | 2010-05-18 | 2 | -2/+9 |
|\ | |||||
| * | Merge 0.6->0.7 | Matthew Wild | 2010-05-18 | 1 | -1/+1 |
| |\ | |||||
| | * | configure: Fix to allow option values containing '=' (thanks Jakub) | Matthew Wild | 2010-05-18 | 1 | -1/+1 |
| | | | |||||
| * | | net/dns: Fix socket.select timeout. | Brian Cully | 2009-12-28 | 1 | -1/+8 |
| | | | |||||
* | | | Merge 0.7->trunk | Matthew Wild | 2010-05-18 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge 0.6->0.7 | Matthew Wild | 2010-05-18 | 1 | -1/+1 |
| |\| | |||||
| | * | net/httpserver_listener: Ignore empty strings on incoming data. | Brian Cully | 2010-04-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.7->trunk | Matthew Wild | 2010-05-17 | 1 | -22/+23 |
|\| | | |||||
| * | | Merge 0.7/MattJ with 0.7 | Matthew Wild | 2010-05-17 | 2 | -1/+6 |
| |\ \ | |||||
| * \ \ | Merge with 0.6 | Matthew Wild | 2010-05-17 | 4 | -25/+28 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | mod_bosh: Always give requests a destroy handler, so that the management of ↵ | Matthew Wild | 2010-05-17 | 1 | -13/+15 |
| | | | | | | | | | | | | | | | | each session's request array and the inactive_sessions logic can happen in one place. Simplifies everything and concludes this series of BOSH fixes. | ||||
| | * | | mod_bosh: Fix handling of rids by not dropping requests with repeated rids ↵ | Matthew Wild | 2010-05-17 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | (assign them their sid instead), and always starting a session with first_rid-1. | ||||
| | * | | mod_bosh: Remove some hacky code for pruning dead requests that hopefully ↵ | Matthew Wild | 2010-05-17 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | never gets executed - if it does there's a bug anyway. | ||||
| | * | | mod_bosh: Remove requests from the session table using table.remove(), ↵ | Matthew Wild | 2010-05-17 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | prevents the possibility of holes in the array. | ||||
* | | | | prosodyctl: Support for the new usermanager, refactor host creation and fail ↵ | Matthew Wild | 2010-05-15 | 1 | -6/+41 |
| | | | | | | | | | | | | | | | | if a host is not using the default authentication provider, for now. (thanks Nicola) | ||||
* | | | | usermanager: Export new_default_provider() | Matthew Wild | 2010-05-15 | 1 | -0/+2 |
| | | | | |||||
* | | | | usermanager: Handle auth providers for components. | Waqas Hussain | 2010-05-13 | 1 | -2/+4 |
| | | | | |||||
* | | | | usermanager: Fix logic for per-host admin tables (thanks Maranda) | Matthew Wild | 2010-05-12 | 1 | -6/+8 |
| | | | | |||||
* | | | | net.xmppclient_listener: Port to util.xmppstream \o/ | Matthew Wild | 2010-05-09 | 1 | -21/+18 |
| | | | | |||||
* | | | | prosody: Load util.xmppstream :( | Matthew Wild | 2010-05-09 | 1 | -0/+1 |
| | | | | |||||
* | | | | util.xmppstream: Stream objects now just have feed/reset methods | Matthew Wild | 2010-05-09 | 1 | -4/+22 |
| | | | | |||||
* | | | | usermanager: Bump log level of incorrect config option warnings | Matthew Wild | 2010-05-07 | 1 | -2/+2 |
| | | | | |||||
* | | | | usermanager: Fix for is_admin to work with the new auth provider architecture | Matthew Wild | 2010-05-07 | 1 | -7/+16 |
| | | | | |||||
* | | | | Merge 0.7->trunk | Waqas Hussain | 2010-05-07 | 3 | -3/+10 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge 0.6->0.7 | Waqas Hussain | 2010-05-07 | 2 | -2/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | mod_console: Set a chunk name for loadstring calls (nicer errors). | Waqas Hussain | 2010-05-07 | 1 | -2/+3 |
| | | | | |||||
| | * | | mod_posix: Fixed a global access. | Waqas Hussain | 2010-05-07 | 1 | -0/+1 |
| | | | | |||||
| * | | | mod_console: Ensure that a null byte is printed after sending the banner. | Waqas Hussain | 2010-05-07 | 1 | -0/+1 |
| | | | | |||||
| * | | | prosody: Modified function metatable for better string representation of ↵ | Waqas Hussain | 2010-05-07 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | functions. | ||||
| * | | | prosody: Lowered log level for a log message. | Waqas Hussain | 2010-05-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | mod_posix: Don't add a server-starting event handler while the ↵ | Waqas Hussain | 2010-05-07 | 1 | -10/+12 |
| | | | | | | | | | | | | | | | | server-starting event is being fired. | ||||
* | | | | net.server_select: Remove some debugging code. | Waqas Hussain | 2010-05-06 | 1 | -3/+0 |
| | | | | |||||
* | | | | Merge 0.7->trunk | Waqas Hussain | 2010-05-06 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Merge 0.6->0.7 | Waqas Hussain | 2010-05-06 | 0 | -0/+0 |
| |\| | | |||||
| | * | | loggingmanager: Enable debug level for default console logging when 'debug' ↵ | Waqas Hussain | 2010-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | mode is enabled in the config. | ||||
| * | | | loggingmanager: Enable debug level for default console logging when 'debug' ↵ | Waqas Hussain | 2010-05-06 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | mode is enabled in the config. | ||||
* | | | util.sasl.scram: Fixed global access. | Waqas Hussain | 2010-05-06 | 1 | -2/+2 |
| | | | |||||
* | | | prosodyctl: Use the global events objects for hosts (again) (thanks albert) ↵ | Matthew Wild | 2010-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | (sorry albert) | ||||
* | | | prosodyctl: Give each host an independant events object, because it seems to ↵ | Matthew Wild | 2010-05-05 | 1 | -3/+1 |
| | | | | | | | | | | | | be the right thing to do | ||||
* | | | prosodyctl: Relocate global prosody object creation (see fff153f7f4de) | Matthew Wild | 2010-05-05 | 1 | -2/+8 |
| | | | |||||
* | | | Merge configmanager->trunk | Matthew Wild | 2010-05-05 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due ↵ | Matthew Wild | 2010-04-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | to previous bad merge with 0.7) | ||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-05 | 2 | -63/+63 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | mod_console: Make use of the new onconnect callback to initialise session ↵ | Matthew Wild | 2010-05-05 | 1 | -62/+62 |
| | | | | | | | | | | | | | | | | and send banner | ||||
| * | | | net.server_select: Fix typo affecting connections with an onconnect listener ↵ | Matthew Wild | 2010-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | that have data pending in the sendbuffer | ||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-05 | 3 | -28/+100 |
|\| | | | |||||
| * | | | mod_proxy65: Send error reply to activation stanza if one or both parties ↵ | Matthew Wild | 2010-05-05 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | were not connected to the proxy | ||||
| * | | | mod_proxy65: Return service-unavailable error when receiving an iq we didn't ↵ | Matthew Wild | 2010-05-05 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | understand | ||||
| * | | | mod_proxy65: Use new server.link to link proxied connections, now works with ↵ | Matthew Wild | 2010-05-05 | 1 | -24/+4 |
| | | | | | | | | | | | | | | | | either connection backend | ||||
| * | | | net.server_select, net.server_event: Add server.link() to link 2 connections ↵ | Matthew Wild | 2010-05-05 | 2 | -0/+44 |
| | | | | | | | | | | | | | | | | with an intermediate buffer of the specified size |