Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-04-11 | 1 | -2/+2 | |
|\| | | | | | ||||||
| * | | | | | net.server_event: Call listener.onconnect if it exists, otherwise stick to ↵ | Matthew Wild | 2010-04-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | listener.onincoming | |||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-04-11 | 1 | -1/+10 | |
|\| | | | | | ||||||
| * | | | | | net.server_select: Support for listener.onconnect | Matthew Wild | 2010-04-11 | 1 | -1/+10 | |
| | | | | | | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-04-09 | 1 | -1/+1 | |
|\| | | | | | ||||||
| * | | | | | Merge 0.6->0.7 | Matthew Wild | 2010-04-09 | 1 | -1/+1 | |
| |\| | | | | ||||||
| | * | | | | net.server: Fix logic error causing traceback when receiving a non-number port | Matthew Wild | 2010-04-09 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | loggingmanager: Fix syntax error :) | Matthew Wild | 2010-04-07 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-04-07 | 1 | -2/+3 | |
|\| | | | | | ||||||
| * | | | | | util.timer: When using libevent hold onto the event handle to stop it being ↵ | Matthew Wild | 2010-04-07 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | collected (and the timer stopping). Fixes BOSH ghosts, thanks Flo, niekie, waqas. | |||||
* | | | | | | loggingmanager: Observe 'debug' config setting for console logging too | Matthew Wild | 2010-04-07 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-04-03 | 3 | -5/+5 | |
|\| | | | | | ||||||
| * | | | | | Merge 0.6->0.7 | Matthew Wild | 2010-04-03 | 3 | -5/+5 | |
| |\| | | | | ||||||
| | * | | | | Merge 0.6/MattJ -> 0.6 | Matthew Wild | 2010-04-03 | 3 | -6/+8 | |
| | |\ \ \ \ | ||||||
| | | * | | | | util.ztact: Fixed global accesses. | Waqas Hussain | 2010-04-01 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | | * | | | | util.uuid: Use a local instead of a global. | Waqas Hussain | 2010-04-01 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | util.stanza: Fixed some more nil global accesses. | Waqas Hussain | 2010-04-01 | 1 | -3/+3 | |
| | | | | | | | ||||||
| | | * | | | | util.stanza: Fixed a nil global access. | Waqas Hussain | 2010-04-01 | 1 | -0/+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-30 | 5 | -14/+14 | |
|\| | | | | | ||||||
| * | | | | | Merge 0.7/waqas->0.7/MattJ | Matthew Wild | 2010-03-30 | 1 | -4/+4 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | net.server_event: Fixed spelling fail. | Waqas Hussain | 2010-03-26 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | 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 | |||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-25 | 1 | -30/+42 | |
|\| | | | | | ||||||
| * | | | | | 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 | |
| | | | | | | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-25 | 1 | -0/+2 | |
|\| | | | | | ||||||
| * | | | | | 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) | |||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-25 | 1 | -1/+1 | |
|\| | | | | | ||||||
| * | | | | | net.server_event: Don't re-try a write if the connection closed (thanks Flo) | Matthew Wild | 2010-03-25 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-24 | 1 | -3/+3 | |
|\| | | | | | ||||||
| * | | | | | net.server_event: Bump timeout values up somewhat | Matthew Wild | 2010-03-24 | 1 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-03-24 | 6 | -104/+120 | |
|\| | | | | | ||||||
| * | | | | | 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.7->trunk | Matthew Wild | 2010-03-22 | 98 | -240/+260 | |
|\| | | | | | ||||||
| * | | | | | 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 | |
| | | | | | |