aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.7->trunkMatthew Wild2010-04-111-2/+2
|\
| * net.server_event: Call listener.onconnect if it exists, otherwise stick to ↵Matthew Wild2010-04-111-2/+2
| | | | | | | | listener.onincoming
* | Merge 0.7->trunkMatthew Wild2010-04-111-1/+10
|\|
| * net.server_select: Support for listener.onconnectMatthew Wild2010-04-111-1/+10
| |
* | Merge 0.7->trunkMatthew Wild2010-04-091-1/+1
|\|
| * Merge 0.6->0.7Matthew Wild2010-04-091-1/+1
| |\
| | * net.server: Fix logic error causing traceback when receiving a non-number portMatthew Wild2010-04-091-1/+1
| | |
* | | loggingmanager: Fix syntax error :)Matthew Wild2010-04-071-1/+1
| | |
* | | Merge 0.7->trunkMatthew Wild2010-04-071-2/+3
|\| |
| * | util.timer: When using libevent hold onto the event handle to stop it being ↵Matthew Wild2010-04-071-2/+3
| | | | | | | | | | | | collected (and the timer stopping). Fixes BOSH ghosts, thanks Flo, niekie, waqas.
* | | loggingmanager: Observe 'debug' config setting for console logging tooMatthew Wild2010-04-071-1/+1
| | |
* | | Merge 0.7->trunkMatthew Wild2010-04-033-5/+5
|\| |
| * | Merge 0.6->0.7Matthew Wild2010-04-033-5/+5
| |\|
| | * Merge 0.6/MattJ -> 0.6Matthew Wild2010-04-033-6/+8
| | |\
| | | * util.ztact: Fixed global accesses.Waqas Hussain2010-04-011-2/+2
| | | |
| | | * util.uuid: Use a local instead of a global.Waqas Hussain2010-04-011-1/+1
| | | |
| | | * util.stanza: Fixed some more nil global accesses.Waqas Hussain2010-04-011-3/+3
| | | |
| | | * util.stanza: Fixed a nil global access.Waqas Hussain2010-04-011-0/+2
| | | |
| | * | mod_bosh: Default stanza namespace should be jabber:client (fixes BOSH to ↵Matthew Wild2010-04-031-2/+2
| | |/ | | | | | | | | | work with recent namespace fix)
* | | Merge 0.7->trunkMatthew Wild2010-03-305-14/+14
|\| |
| * | Merge 0.7/waqas->0.7/MattJMatthew Wild2010-03-301-4/+4
| |\ \
| | * | net.server_event: Fixed spelling fail.Waqas Hussain2010-03-261-4/+4
| | | |
| * | | Merge 0.6->0.7Matthew Wild2010-03-304-10/+10
| |\ \ \ | | |/ / | |/| / | | |/
| | * xmppserver_listener: Compatibility fix for older Prosodies with the s2s ↵Matthew Wild2010-03-301-0/+3
| | | | | | | | | | | | xmlns bug
| | * stanza_router, s2smanager, modulemanager: Fix for handling of the default ↵Matthew Wild2010-03-303-10/+7
| | | | | | | | | | | | namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted
* | | Merge 0.7->trunkMatthew Wild2010-03-251-30/+42
|\| |
| * | tools/erlparse: Discard erlang PIDs instead of choking on them as a syntax errorMatthew Wild2010-03-251-0/+6
| | |
| * | tools/erlparse: Report the line number when showing a syntax error in the ↵Matthew Wild2010-03-251-2/+6
| | | | | | | | | | | | input file
| * | tools/erlparse: Optimisations aplenty for faster processing of large filesMatthew Wild2010-03-251-28/+30
| | |
* | | Merge 0.7->trunkMatthew Wild2010-03-251-0/+2
|\| |
| * | tools/ejabberd2prosody: Create prosody singleton so datamanager can detect ↵Matthew Wild2010-03-251-0/+2
| | | | | | | | | | | | the platform (set no platform to use lfs, pposix isn't necessary here)
* | | Merge 0.7->trunkMatthew Wild2010-03-251-1/+1
|\| |
| * | net.server_event: Don't re-try a write if the connection closed (thanks Flo)Matthew Wild2010-03-251-1/+1
| | |
* | | Merge 0.7->trunkMatthew Wild2010-03-241-3/+3
|\| |
| * | net.server_event: Bump timeout values up somewhatMatthew Wild2010-03-241-3/+3
| | |
* | | Merge 0.7->trunkMatthew Wild2010-03-246-104/+120
|\| |
| * | Merge 0.7/waqas->0.7/MattJMatthew Wild2010-03-243-4/+12
| |\ \
| | * | util.sasl.digest-md5: Removed unnnecessary check (which included a nil ↵Waqas Hussain2010-03-241-2/+0
| | | | | | | | | | | | | | | | global access).
| | * | mod_register: Use set_password to set passwords instead of create_user.Waqas Hussain2010-03-241-2/+3
| | | |
| | * | usermanager: Added function set_password.Waqas Hussain2010-03-241-0/+9
| | | |
| * | | Merge 0.6->0.7Matthew Wild2010-03-241-2/+3
| |\ \ \ | | |/ / | |/| / | | |/
| | * mod_tls: Add s2s_allow_encryption option which, when set to false, disabled ↵Matthew Wild2010-03-241-18/+27
| | | | | | | | | | | | TLS for s2s
| * | prosody.cfg.lua.dist: Whitespace fix.Waqas Hussain2010-03-231-89/+89
| | |
| * | prosody.cfg.lua.dist: Disable mod_privacy by default.Waqas Hussain2010-03-231-1/+1
| | |
| * | usermanager: Return sane errors/results when Cyrus SASL is in use.Waqas Hussain2010-03-231-1/+8
| | |
| * | mod_saslauth: Tidier code for SASL backend selection.Waqas Hussain2010-03-231-8/+6
| | |
| * | mod_saslauth: Fail with an error when the requested SASL backend cannot be used.Waqas Hussain2010-03-231-4/+6
| | |
* | | Merge 0.7->trunkMatthew Wild2010-03-2298-240/+260
|\| |
| * | Merge 0.6->0.7Matthew Wild2010-03-2297-238/+258
| |\|
| | * util.windows: Convert from Windows line endingsMatthew Wild2010-03-221-58/+58
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 18:24:16 +0000