Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-22 | 1 | -2/+4 | |
|\| | | | | | ||||||
| * | | | | | stanza_router: Don't send error replies for stanzas of type 'error' and ↵ | Waqas Hussain | 2010-03-22 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 'result' on unbound authenticated connections. [originally fa84451e9b35 in 0.6] | |||||
| * | | | | | stanza_router: Allow non-jabber:client elements after auth, before bind. ↵ | Waqas Hussain | 2010-03-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [originally 2c538d4bde13 in 0.6] | |||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-22 | 2 | -0/+2 | |
|\| | | | | | ||||||
| * | | | | | sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions ↵ | Matthew Wild | 2010-03-22 | 2 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | (fixes a logging traceback, thanks Flo) | |||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-22 | 2 | -11/+31 | |
|\| | | | | | ||||||
| * | | | | | 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) | |||||
| * | | | | | rostermanager: Don't bump the roster version if it is == true (ie. we are ↵ | Matthew Wild | 2010-03-22 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | not versioning the roster) | |||||
| * | | | | | mod_roster: Tidier code for the roster versioning logic | Matthew Wild | 2010-03-22 | 1 | -3/+4 | |
| | | | | | | ||||||
* | | | | | | mod_roster: Tidier code for the roster versioning logic | Matthew Wild | 2010-03-22 | 1 | -3/+4 | |
| | | | | | | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-20 | 1 | -0/+1 | |
|\| | | | | | ||||||
| * | | | | | .hgignore: Ignore prosody.version (thanks Florob) | Matthew Wild | 2010-03-20 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-18 | 1 | -13/+12 | |
|\| | | | | | ||||||
| * | | | | | util.sasl_cyrus: Return invalid-mechanism instead of undefined-condition ↵ | Matthew Wild | 2010-03-18 | 1 | -6/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | where appropriate | |||||
| * | | | | | util.sasl_cyrus: Clarify some log messages and levels | Matthew Wild | 2010-03-18 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | util.sasl_cyrus: Protect the call to cyrussasl.server_new properly. | Paul Aurich | 2010-03-17 | 1 | -5/+8 | |
| | | | | | | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-18 | 0 | -0/+0 | |
|\| | | | | | ||||||
| * | | | | | util.sasl_cyrus: If available, use a c14n callback for interoperability with ↵ | Paul Aurich | 2010-03-17 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bad clients. Specifically, clients that specify an authzid 'user@domain.com' and authcid 'user'. | |||||
| * | | | | | mod_saslauth: Add a sasl_realm option | Paul Aurich | 2010-03-17 | 1 | -2/+3 | |
| | | | | | | ||||||
| * | | | | | util.cyrus_sasl: Pass the realm to Cyrus | Paul Aurich | 2010-03-15 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge darkrain->trunk | Matthew Wild | 2010-03-18 | 2 | -2/+13 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | util.sasl_cyrus: If available, use a c14n callback for interoperability with ↵ | Paul Aurich | 2010-03-17 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bad clients. Specifically, clients that specify an authzid 'user@domain.com' and authcid 'user'. | |||||
| * | | | | | | mod_saslauth: Add a sasl_realm option | Paul Aurich | 2010-03-17 | 1 | -2/+3 | |
| | | | | | | | ||||||
* | | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-18 | 2 | -8/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | ||||||
| * | | | | | Merge 0.6->0.7 | Matthew Wild | 2010-03-18 | 2 | -8/+3 | |
| |\| | | | | ||||||
| | * | | | | Merge 0.6 with waqas | Matthew Wild | 2010-03-18 | 1 | -3/+3 | |
| | |\ \ \ \ | ||||||
| | | * | | | | mod_compression: Improved and lowered log level of some logged messages. | Waqas Hussain | 2010-03-16 | 1 | -3/+3 | |
| | | | | | | | ||||||
| | * | | | | | s2smanager: Remove the infamous 'as per RFC' log message entirely (it ↵ | Matthew Wild | 2010-03-18 | 1 | -6/+0 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | happens too often to be useful) | |||||
* | | | | | | Merge with 0.7 | Matthew Wild | 2010-03-17 | 1 | -10/+16 | |
|\| | | | | | ||||||
| * | | | | | Merge with 0.6 (into 0.7, namely mod_compression fixes) | Matthew Wild | 2010-03-17 | 1 | -10/+16 | |
| |\| | | | | ||||||
| | * | | | | mod_compression: Return <setup-failed/> instead of <unsupported-method/> ↵ | Waqas Hussain | 2010-03-09 | 1 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | where applicable. | |||||
| | * | | | | mod_compression: More robust stanza processing. | Waqas Hussain | 2010-03-09 | 1 | -1/+2 | |
| | | | | | | ||||||
| | * | | | | mod_compression: Don't succeed after indicating a failure. | Waqas Hussain | 2010-03-09 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | mod_compression: Don't tell client compression succeeded when it didn't. | Waqas Hussain | 2010-03-09 | 1 | -4/+4 | |
| | | | | | | ||||||
| | * | | | | mod_compression: Fixed various possible tracebacks in logging. | Waqas Hussain | 2010-03-09 | 1 | -6/+7 | |
| | | | | | | ||||||
* | | | | | | util.cyrus_sasl: Pass the realm to Cyrus | Paul Aurich | 2010-03-15 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | MUC: Added support for letting clients manage discussion history. | Waqas Hussain | 2010-03-17 | 1 | -7/+45 | |
| | | | | | | ||||||
* | | | | | | Merge with 0.7 (and indirectly 0.6.2) | Matthew Wild | 2010-03-15 | 5 | -36/+114 | |
|\| | | | | | |_|_|/ / |/| | | | | ||||||
| * | | | | Merge 0.6.2/waqas with 0.6.2/MattJ | Matthew Wild | 2010-03-03 | 0 | -0/+0 | |
| |\| | | | ||||||
| | * | | | Merge 0.6.2/waqas with 0.6.2/MattJ | Matthew Wild | 2010-03-03 | 37 | -415/+319 | |
| | |\ \ \ | ||||||
| | | * | | | stanza_router: Don't send error replies for stanzas of type 'error' and ↵ | Waqas Hussain | 2010-03-04 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 'result' on unbound authenticated connections. | |||||
| | | * | | | stanza_router: Allow non-jabber:client elements after auth, before bind. | Waqas Hussain | 2010-03-04 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | Fixing some typos. | Tobias Markmann | 2009-11-20 | 1 | -4/+4 | |
| | | | | | | ||||||
| | | * | | | util.sasl.plain: Allow empty authzid (thanks bjc). | Waqas Hussain | 2009-12-01 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | mod_tls: Don't offer TLS on hosts that don't have any certs | Matthew Wild | 2010-02-12 | 1 | -2/+4 | |
| | | | | | | ||||||
| | | * | | | prosodyctl.man: Update email address | Dwayne Bent | 2010-02-21 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | mod_console: Uncomment the help for server:shutdown() - thanks darkrain | Matthew Wild | 2010-02-22 | 1 | -1/+1 | |
| | | | | | |