aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge 0.6->0.7Matthew Wild2010-05-181-1/+1
| |\| | |
| | * | | net/httpserver_listener: Ignore empty strings on incoming data.Brian Cully2010-04-281-1/+1
| | | | |
* | | | | Merge 0.7->trunkMatthew Wild2010-05-171-22/+23
|\| | | |
| * | | | Merge 0.7/MattJ with 0.7Matthew Wild2010-05-172-1/+6
| |\ \ \ \
| * \ \ \ \ Merge with 0.6Matthew Wild2010-05-174-25/+28
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | mod_bosh: Always give requests a destroy handler, so that the management of ↵Matthew Wild2010-05-171-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 Wild2010-05-171-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 Wild2010-05-171-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 Wild2010-05-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | prevents the possibility of holes in the array.
* | | | | | prosodyctl: Support for the new usermanager, refactor host creation and fail ↵Matthew Wild2010-05-151-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | if a host is not using the default authentication provider, for now. (thanks Nicola)
* | | | | | usermanager: Export new_default_provider()Matthew Wild2010-05-151-0/+2
| | | | | |
* | | | | | usermanager: Handle auth providers for components.Waqas Hussain2010-05-131-2/+4
| | | | | |
* | | | | | usermanager: Fix logic for per-host admin tables (thanks Maranda)Matthew Wild2010-05-121-6/+8
| |_|_|_|/ |/| | | |
* | | | | net.xmppclient_listener: Port to util.xmppstream \o/Matthew Wild2010-05-091-21/+18
| | | | |
* | | | | prosody: Load util.xmppstream :(Matthew Wild2010-05-091-0/+1
| | | | |
* | | | | util.xmppstream: Stream objects now just have feed/reset methodsMatthew Wild2010-05-091-4/+22
| | | | |
* | | | | usermanager: Bump log level of incorrect config option warningsMatthew Wild2010-05-071-2/+2
| | | | |
* | | | | usermanager: Fix for is_admin to work with the new auth provider architectureMatthew Wild2010-05-071-7/+16
| | | | |
* | | | | Merge 0.7->trunkWaqas Hussain2010-05-073-3/+10
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge 0.6->0.7Waqas Hussain2010-05-072-2/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mod_console: Set a chunk name for loadstring calls (nicer errors).Waqas Hussain2010-05-071-2/+3
| | | | |
| | * | | mod_posix: Fixed a global access.Waqas Hussain2010-05-071-0/+1
| | | | |
| * | | | mod_console: Ensure that a null byte is printed after sending the banner.Waqas Hussain2010-05-071-0/+1
| | | | |
| * | | | prosody: Modified function metatable for better string representation of ↵Waqas Hussain2010-05-071-0/+4
| | | | | | | | | | | | | | | | | | | | functions.
| * | | | prosody: Lowered log level for a log message.Waqas Hussain2010-05-071-1/+1
| | | | |
* | | | | mod_posix: Don't add a server-starting event handler while the ↵Waqas Hussain2010-05-071-10/+12
| | | | | | | | | | | | | | | | | | | | server-starting event is being fired.
* | | | | net.server_select: Remove some debugging code.Waqas Hussain2010-05-061-3/+0
| | | | |
* | | | | Merge 0.7->trunkWaqas Hussain2010-05-061-1/+1
|\| | | |
| * | | | Merge 0.6->0.7Waqas Hussain2010-05-060-0/+0
| |\| | |
| | * | | loggingmanager: Enable debug level for default console logging when 'debug' ↵Waqas Hussain2010-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | mode is enabled in the config.
| * | | | loggingmanager: Enable debug level for default console logging when 'debug' ↵Waqas Hussain2010-05-061-1/+1
| | |/ / | |/| | | | | | | | | | mode is enabled in the config.
* | | | util.sasl.scram: Fixed global access.Waqas Hussain2010-05-061-2/+2
| | | |
* | | | prosodyctl: Use the global events objects for hosts (again) (thanks albert) ↵Matthew Wild2010-05-051-1/+1
| | | | | | | | | | | | | | | | (sorry albert)
* | | | prosodyctl: Give each host an independant events object, because it seems to ↵Matthew Wild2010-05-051-3/+1
| | | | | | | | | | | | | | | | be the right thing to do
* | | | prosodyctl: Relocate global prosody object creation (see fff153f7f4de)Matthew Wild2010-05-051-2/+8
| | | |
* | | | Merge configmanager->trunkMatthew Wild2010-05-051-3/+4
|\ \ \ \
| * | | | configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due ↵Matthew Wild2010-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | to previous bad merge with 0.7)
* | | | | Merge 0.7->trunkMatthew Wild2010-05-052-63/+63
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | mod_console: Make use of the new onconnect callback to initialise session ↵Matthew Wild2010-05-051-62/+62
| | | | | | | | | | | | | | | | | | | | and send banner
| * | | | net.server_select: Fix typo affecting connections with an onconnect listener ↵Matthew Wild2010-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | that have data pending in the sendbuffer
* | | | | Merge 0.7->trunkMatthew Wild2010-05-053-28/+100
|\| | | |
| * | | | mod_proxy65: Send error reply to activation stanza if one or both parties ↵Matthew Wild2010-05-051-0/+10
| | | | | | | | | | | | | | | | | | | | were not connected to the proxy
| * | | | mod_proxy65: Return service-unavailable error when receiving an iq we didn't ↵Matthew Wild2010-05-051-0/+3
| | | | | | | | | | | | | | | | | | | | understand
| * | | | mod_proxy65: Use new server.link to link proxied connections, now works with ↵Matthew Wild2010-05-051-24/+4
| | | | | | | | | | | | | | | | | | | | either connection backend
| * | | | net.server_select, net.server_event: Add server.link() to link 2 connections ↵Matthew Wild2010-05-052-0/+44
| | | | | | | | | | | | | | | | | | | | with an intermediate buffer of the specified size
| * | | | net.server_select, net.server_event: Support for ondrain listener callback ↵Matthew Wild2010-05-052-1/+9
| | | | | | | | | | | | | | | | | | | | for when send buffer is empty
| * | | | net.server_select, net.server_event: Rename :pattern() method to :set_mode() ↵Matthew Wild2010-05-052-2/+9
| | | | | | | | | | | | | | | | | | | | for select backend, and add :set_mode() to event backend
| * | | | net.server_select, net.server_event: Support for :pause() and :resume() on ↵Matthew Wild2010-05-052-1/+21
| | | | | | | | | | | | | | | | | | | | connections
* | | | | usermanager: Give the default auth provider a name, you'll never guess what ↵Matthew Wild2010-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | it is.
* | | | | Merge Tobias's fancy SASL branch->trunkMatthew Wild2010-05-056-83/+142
|\ \ \ \ \