Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge 0.6->0.7 | Matthew Wild | 2010-03-30 | 4 | -10/+10 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | xmppserver_listener: Compatibility fix for older Prosodies with the s2s ↵ | Matthew Wild | 2010-03-30 | 1 | -0/+3 | |
| | | | | | | | | | | | | xmlns bug | |||||
| * | | stanza_router, s2smanager, modulemanager: Fix for handling of the default ↵ | Matthew Wild | 2010-03-30 | 3 | -10/+7 | |
| | | | | | | | | | | | | namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted | |||||
* | | | tools/erlparse: Discard erlang PIDs instead of choking on them as a syntax error | Matthew Wild | 2010-03-25 | 1 | -0/+6 | |
| | | | ||||||
* | | | tools/erlparse: Report the line number when showing a syntax error in the ↵ | Matthew Wild | 2010-03-25 | 1 | -2/+6 | |
| | | | | | | | | | | | | input file | |||||
* | | | tools/erlparse: Optimisations aplenty for faster processing of large files | Matthew Wild | 2010-03-25 | 1 | -28/+30 | |
| | | | ||||||
* | | | tools/ejabberd2prosody: Create prosody singleton so datamanager can detect ↵ | Matthew Wild | 2010-03-25 | 1 | -0/+2 | |
| | | | | | | | | | | | | the platform (set no platform to use lfs, pposix isn't necessary here) | |||||
* | | | net.server_event: Don't re-try a write if the connection closed (thanks Flo) | Matthew Wild | 2010-03-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | net.server_event: Bump timeout values up somewhat | Matthew Wild | 2010-03-24 | 1 | -3/+3 | |
| | | | ||||||
* | | | Merge 0.7/waqas->0.7/MattJ | Matthew Wild | 2010-03-24 | 3 | -4/+12 | |
|\ \ \ | ||||||
| * | | | util.sasl.digest-md5: Removed unnnecessary check (which included a nil ↵ | Waqas Hussain | 2010-03-24 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | global access). | |||||
| * | | | mod_register: Use set_password to set passwords instead of create_user. | Waqas Hussain | 2010-03-24 | 1 | -2/+3 | |
| | | | | ||||||
| * | | | usermanager: Added function set_password. | Waqas Hussain | 2010-03-24 | 1 | -0/+9 | |
| | | | | ||||||
* | | | | 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 | |||||
* | | | prosody.cfg.lua.dist: Whitespace fix. | Waqas Hussain | 2010-03-23 | 1 | -89/+89 | |
| | | | ||||||
* | | | prosody.cfg.lua.dist: Disable mod_privacy by default. | Waqas Hussain | 2010-03-23 | 1 | -1/+1 | |
| | | | ||||||
* | | | usermanager: Return sane errors/results when Cyrus SASL is in use. | Waqas Hussain | 2010-03-23 | 1 | -1/+8 | |
| | | | ||||||
* | | | 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.6->0.7 | Matthew Wild | 2010-03-22 | 97 | -238/+258 | |
|\| | | ||||||
| * | | util.windows: Convert from Windows line endings | Matthew Wild | 2010-03-22 | 1 | -58/+58 | |
| | | | ||||||
| * | | Update copyright headers for 2010 | Matthew Wild | 2010-03-22 | 100 | -199/+212 | |
| | | | ||||||
| * | | loggingmanager: Don't use non-standard format specifier to format the timestamp. | Waqas Hussain | 2010-03-22 | 1 | -1/+1 | |
| | | | ||||||
* | | | 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] | |||||
* | | | sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions ↵ | Matthew Wild | 2010-03-22 | 2 | -0/+2 | |
| | | | | | | | | | | | | (fixes a logging traceback, thanks Flo) | |||||
* | | | 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 | |
| | | | ||||||
* | | | .hgignore: Ignore prosody.version (thanks Florob) | Matthew Wild | 2010-03-20 | 1 | -0/+1 | |
| | | | ||||||
* | | | 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 | |
| | | | ||||||
* | | | 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 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.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 | |
| | | |