aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| | * Update copyright headers for 2010Matthew Wild2010-03-22100-199/+212
| | |
| | * loggingmanager: Don't use non-standard format specifier to format the timestamp.Waqas Hussain2010-03-221-1/+1
| | |
* | | util.xmppstream: new() now returns a parser objectMatthew Wild2010-03-221-4/+9
| | |
* | | util.xmppstream: Initial commitMatthew Wild2010-03-221-0/+145
| | |
* | | Merge 0.7->trunkMatthew Wild2010-03-221-2/+4
|\| |
| * | stanza_router: Don't send error replies for stanzas of type 'error' and ↵Waqas Hussain2010-03-221-1/+3
| | | | | | | | | | | | 'result' on unbound authenticated connections. [originally fa84451e9b35 in 0.6]
| * | stanza_router: Allow non-jabber:client elements after auth, before bind. ↵Waqas Hussain2010-03-221-1/+1
| | | | | | | | | | | | [originally 2c538d4bde13 in 0.6]
* | | Merge 0.7->trunkMatthew Wild2010-03-222-0/+2
|\| |
| * | sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions ↵Matthew Wild2010-03-222-0/+2
| | | | | | | | | | | | (fixes a logging traceback, thanks Flo)
* | | Merge 0.7->trunkMatthew Wild2010-03-222-11/+31
|\| |
| * | mod_groups: Ignore whitespace on group member JID lines (thanks Luis!)Matthew Wild2010-03-221-1/+1
| | |
| * | mod_groups: Fixes to make compatible with roster versioning - set version to ↵Matthew Wild2010-03-221-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 Wild2010-03-221-1/+1
| | | | | | | | | | | | group members unless necessary
| * | mod_groups: Only create group lists when necessary (now we can reliably ↵Matthew Wild2010-03-221-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 Wild2010-03-221-2/+8
| | | | | | | | | | | | not versioning the roster)
| * | mod_roster: Tidier code for the roster versioning logicMatthew Wild2010-03-221-3/+4
| | |
* | | mod_roster: Tidier code for the roster versioning logicMatthew Wild2010-03-221-3/+4
| | |
* | | Merge 0.7->trunkMatthew Wild2010-03-201-0/+1
|\| |
| * | .hgignore: Ignore prosody.version (thanks Florob)Matthew Wild2010-03-201-0/+1
| | |
* | | Merge 0.7->trunkMatthew Wild2010-03-181-13/+12
|\| |
| * | util.sasl_cyrus: Return invalid-mechanism instead of undefined-condition ↵Matthew Wild2010-03-181-6/+2
| | | | | | | | | | | | where appropriate
| * | util.sasl_cyrus: Clarify some log messages and levelsMatthew Wild2010-03-181-3/+3
| | |
| * | util.sasl_cyrus: Protect the call to cyrussasl.server_new properly.Paul Aurich2010-03-171-5/+8
| | |
* | | Merge 0.7->trunkMatthew Wild2010-03-180-0/+0
|\| |
| * | util.sasl_cyrus: If available, use a c14n callback for interoperability with ↵Paul Aurich2010-03-171-0/+10
| | | | | | | | | | | | | | | | | | bad clients. Specifically, clients that specify an authzid 'user@domain.com' and authcid 'user'.
| * | mod_saslauth: Add a sasl_realm optionPaul Aurich2010-03-171-2/+3
| | |
| * | util.cyrus_sasl: Pass the realm to CyrusPaul Aurich2010-03-151-1/+1
| | |
* | | Merge darkrain->trunkMatthew Wild2010-03-182-2/+13
|\ \ \
| * | | util.sasl_cyrus: If available, use a c14n callback for interoperability with ↵Paul Aurich2010-03-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | bad clients. Specifically, clients that specify an authzid 'user@domain.com' and authcid 'user'.