Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with backout | Matthew Wild | 2010-05-21 | 1 | -30/+11 |
|\ | |||||
| * | Backed out changeset c75c22c316d6 (the XMPP spec now gives a better way to ↵ | Matthew Wild | 2010-05-21 | 1 | -30/+11 |
| | | | | | | | | do this) | ||||
* | | mod_bosh: Re-layout session object creation to make lines shorter | Matthew Wild | 2010-05-21 | 1 | -4/+8 |
| | | |||||
* | | mod_bosh: Add option consider_bosh_secure to treat BOSH sessions as ↵ | Matthew Wild | 2010-05-21 | 1 | -1/+3 |
| | | | | | | | | encrypted even if they don't use HTTP (useful for when secure requests are proxied to Prosody over HTTP) | ||||
* | | mod_privacy: Fix several possible tracebacks when either the contact is a ↵ | Matthew Wild | 2010-05-21 | 1 | -9/+14 |
| | | | | | | | | host JID, or the contact isn't in your roster and you have roster group/subscription rules in place | ||||
* | | mod_privacy: Remove validation that checks a roster group you block actually ↵ | Matthew Wild | 2010-05-21 | 1 | -20/+1 |
| | | | | | | | | exists - it would be time-consuming on large rosters, and isn't important (or correct?) anyway. | ||||
* | | mod_saslauth: Split out cyrus SASL config options into locals, and add ↵ | Matthew Wild | 2010-05-20 | 1 | -1/+10 |
| | | | | | | | | support for cyrus_application_name (default: 'prosody') | ||||
* | | usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional ↵ | Matthew Wild | 2010-05-20 | 2 | -5/+15 |
| | | | | | | | | (default: not required) | ||||
* | | util.sasl_cyrus: Support for specifying the application name (to pass to ↵ | Matthew Wild | 2010-05-20 | 1 | -2/+2 |
| | | | | | | | | Cyrus SASL's init()) | ||||
* | | mod_saslauth: Add return value and error message to the Cyrus SASL ↵ | Matthew Wild | 2010-05-20 | 1 | -3/+4 |
| | | | | | | | | handle_status callback | ||||
* | | mod_saslauth: Allow the Cyrus SASL realm to be configurable | Matthew Wild | 2010-05-20 | 1 | -1/+1 |
| | | |||||
* | | net.dns: Remove redundant locals declaration | Matthew Wild | 2010-05-20 | 1 | -1/+0 |
| | | |||||
* | | net.dns: Fix dns.lookup from commit e54774bd73a7 | Matthew Wild | 2010-05-20 | 1 | -1/+1 |
| | | |||||
* | | mod_groups: Remove potentially verbose per-contact logging (thanks Flo) | Matthew Wild | 2010-05-20 | 1 | -3/+3 |
| | | |||||
* | | 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.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/MattJ with 0.7 | Matthew Wild | 2010-05-17 | 2 | -1/+6 |
|\ \ \ | |||||
| * \ \ | Merge 0.6->0.7 | Waqas Hussain | 2010-05-07 | 2 | -2/+4 |
| |\ \ \ | |||||
| * | | | | 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 |
| | | | | | |||||
| * | | | | 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. | ||||
* | | | | | | 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. | ||||
| * | | | 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 |
| |/ / | |||||
| * | | loggingmanager: Enable debug level for default console logging when 'debug' ↵ | Waqas Hussain | 2010-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | mode is enabled in the config. | ||||
* | | | 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 | ||||
* | | | 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 | ||||
* | | | net.server_select, net.server_event: Support for ondrain listener callback ↵ | Matthew Wild | 2010-05-05 | 2 | -1/+9 |
| | | | | | | | | | | | | for when send buffer is empty | ||||
* | | | net.server_select, net.server_event: Rename :pattern() method to :set_mode() ↵ | Matthew Wild | 2010-05-05 | 2 | -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 Wild | 2010-05-05 | 2 | -1/+21 |
| | | | | | | | | | | | | connections | ||||
* | | | net.server_event: Be sure to fire onincoming for backwards-compatibility ↵ | Matthew Wild | 2010-05-05 | 1 | -1/+2 |
| | | | | | | | | | | | | with pre-onconnect listeners (thanks darkrain/mod_console) | ||||
* | | | Merge 0.6 into 0.7. | Waqas Hussain | 2010-05-01 | 4 | -129/+118 |
|\| | | |||||
| * | | Tagging 0.6.2 | Matthew Wild | 2010-04-14 | 0 | -0/+0 |
| | | | |||||
| * | | prosody.cfg.lua.dist: Refactor the default config file based on feedback ↵vault/0.6.20.6.2 | Matthew Wild | 2010-04-14 | 1 | -88/+82 |
| | | | | | | | | | | | | from confused users | ||||
| * | | hostmanager: Re-word log messages in line with config changes | Matthew Wild | 2010-04-14 | 1 | -3/+3 |
| | | | |||||
| * | | configmanager: Add VirtualHost as an alias for Host | Matthew Wild | 2010-04-14 | 1 | -3/+3 |
| | | | |||||
| * | | MUC: Allow moderators which are not owners to change roles. | Waqas Hussain | 2010-04-14 | 1 | -1/+1 |
| | | |