Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |
| |\| | | ||||||
| | * | | mod_bosh: Default stanza namespace should be jabber:client (fixes BOSH to ↵ | Matthew Wild | 2010-04-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | work with recent namespace fix) | |||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-24 | 3 | -12/+14 | |
|\| | | | ||||||
| * | | | Merge 0.7/waqas->0.7/MattJ | Matthew Wild | 2010-03-24 | 1 | -2/+3 | |
| |\ \ \ | ||||||
| | * | | | mod_register: Use set_password to set passwords instead of create_user. | Waqas Hussain | 2010-03-24 | 1 | -2/+3 | |
| | | | | | ||||||
| * | | | | Merge 0.6->0.7 | Matthew Wild | 2010-03-24 | 1 | -2/+3 | |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | ||||||
| | * | | mod_tls: Add s2s_allow_encryption option which, when set to false, disabled ↵ | Matthew Wild | 2010-03-24 | 1 | -18/+27 | |
| | | | | | | | | | | | | | | | | TLS for s2s | |||||
| * | | | mod_saslauth: Tidier code for SASL backend selection. | Waqas Hussain | 2010-03-23 | 1 | -8/+6 | |
| | | | | ||||||
| * | | | mod_saslauth: Fail with an error when the requested SASL backend cannot be used. | Waqas Hussain | 2010-03-23 | 1 | -4/+6 | |
| | | | | ||||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-22 | 30 | -61/+61 | |
|\| | | | ||||||
| * | | | Merge 0.6->0.7 | Matthew Wild | 2010-03-22 | 30 | -61/+61 | |
| |\| | | ||||||
| | * | | Update copyright headers for 2010 | Matthew Wild | 2010-03-22 | 32 | -64/+64 | |
| | | | | ||||||
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-22 | 1 | -9/+23 | |
|\| | | | ||||||
| * | | | mod_groups: Ignore whitespace on group member JID lines (thanks Luis!) | Matthew Wild | 2010-03-22 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | mod_groups: Fixes to make compatible with roster versioning - set version to ↵ | Matthew Wild | 2010-03-22 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | 'true' to indicate that the roster is not being versioned | |||||
| * | | | mod_groups: Missed hunk from last commit, don't create the list of public ↵ | Matthew Wild | 2010-03-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | group members unless necessary | |||||
| * | | | mod_groups: Only create group lists when necessary (now we can reliably ↵ | Matthew Wild | 2010-03-22 | 1 | -7/+16 | |
| | | | | | | | | | | | | | | | | detect when a user is in /any/ group, including public ones) | |||||
| * | | | mod_roster: Tidier code for the roster versioning logic | Matthew Wild | 2010-03-22 | 1 | -3/+4 | |
| | | | | ||||||
| * | | | mod_saslauth: Add a sasl_realm option | Paul Aurich | 2010-03-17 | 1 | -2/+3 | |
| | | | |