Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mod_pep: Use is_contact_subscribed (which uses the new rostermanager fix to ↵ | Matthew Wild | 2010-06-01 | 1 | -3/+2 |
| | | | | avoid unnecessary roster loads) | ||||
* | Merge compression fix | Matthew Wild | 2010-05-29 | 1 | -2/+2 |
|\ | |||||
| * | mod_compression: Update for new session.data() syntax, fixes invalid XML ↵ | Matthew Wild | 2010-05-29 | 1 | -2/+2 |
| | | | | | | | | errors after compression negotiation (thanks hg bisect) | ||||
* | | Merge 0.7->trunk | Matthew Wild | 2010-05-26 | 1 | -1/+3 |
|\ \ | |||||
| * | | mod_groups: Check for existence of roster[false] before clearing version ↵ | Matthew Wild | 2010-05-26 | 1 | -1/+3 |
| | | | | | | | | | | | | (thanks Flo) | ||||
* | | | Merge 0.7->trunk | Matthew Wild | 2010-05-23 | 3 | -45/+37 |
|\| | | |||||
| * | | mod_private: Detect datamanager read errors, and respond with ↵ | Waqas Hussain | 2010-05-24 | 1 | -1/+5 |
| | | | | | | | | | | | | 'internal-server-error'. | ||||
| * | | mod_presence: Don't send 'unsubscribed' in response to probes when roster ↵ | Waqas Hussain | 2010-05-24 | 1 | -2/+3 |
| | | | | | | | | | | | | loading fails. | ||||
| * | | mod_presence: Removed a useless check when handling incoming presence probes ↵ | Waqas Hussain | 2010-05-24 | 1 | -4/+0 |
| | | | | | | | | | | | | and subscriptions. | ||||
| * | | mod_privacy: Improved logging. | Waqas Hussain | 2010-05-22 | 1 | -8/+8 |
| | | | |||||
| * | | mod_presence: Added option 'ignore_presence_priority'. | Waqas Hussain | 2010-05-22 | 1 | -0/+10 |
| | | | |||||
| * | | 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) | ||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-21 | 2 | -33/+25 |
|\| | | | |||||
| * | | | 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. | ||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-20 | 1 | -1/+10 |
|\| | | | |||||
| * | | | 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') | ||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-20 | 1 | -7/+16 |
|\| | | | |||||
| * | | | usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional ↵ | Matthew Wild | 2010-05-20 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | (default: not required) | ||||
| * | | | 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 |
| | | | | |||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-20 | 1 | -3/+3 |
|\| | | | |||||
| * | | | mod_groups: Remove potentially verbose per-contact logging (thanks Flo) | Matthew Wild | 2010-05-20 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-17 | 1 | -22/+23 |
|\| | | | |_|/ |/| | | |||||
| * | | Merge 0.7/MattJ with 0.7 | Matthew Wild | 2010-05-17 | 1 | -0/+1 |
| |\ \ | |||||
| * \ \ | Merge with 0.6 | Matthew Wild | 2010-05-17 | 3 | -24/+27 |
| |\ \ \ | |||||
| | * | | | 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. | ||||
* | | | | | Merge 0.7->trunk | Waqas Hussain | 2010-05-07 | 2 | -2/+5 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | 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 |
| | |/ / | |/| | | |||||
* | | | | 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. | ||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-05 | 1 | -62/+62 |
|\| | | | |||||
| * | | | mod_console: Make use of the new onconnect callback to initialise session ↵ | Matthew Wild | 2010-05-05 | 1 | -62/+62 |
| | | | | | | | | | | | | | | | | and send banner | ||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-05 | 1 | -24/+17 |
|\| | | | |||||
| * | | | 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 | ||||
| * | | | Merge 0.6 into 0.7. | Waqas Hussain | 2010-05-01 | 1 | -1/+1 |
| |\| | | |||||
| | * | | MUC: Allow moderators which are not owners to change roles. | Waqas Hussain | 2010-04-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | MUC: Include <status code='100'/> in a message, not in presence. Fixes ↵ | Waqas Hussain | 2010-04-19 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | various issues. | ||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-04-03 | 1 | -2/+2 |
|\| | | | |||||
| * | | | Merge 0.6->0.7 | Matthew Wild | 2010-04-03 | 1 | -2/+2 |
| |\| | |