aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | sessionmanager: Change error for reaching resource limit from 'conflict' to ↵Waqas Hussain2010-05-221-1/+1
| | | | | | | | | | | | 'resource-constraint' during session bind.
| * | sessionmanager: If roster loading fails during resource bind, kick the user ↵Waqas Hussain2010-05-221-1/+13
| | | | | | | | | | | | with an internal-server-error.
| * | rostermanager: When loading the roster, also return a datamanager error if ↵Waqas Hussain2010-05-221-2/+3
| | | | | | | | | | | | available.
| * | util.datamanager: When failing to load a file, and the file exists, return ↵Waqas Hussain2010-05-221-4/+12
| | | | | | | | | | | | nil, error.
| * | mod_privacy: Improved logging.Waqas Hussain2010-05-221-8/+8
| | |
| * | mod_presence: Added option 'ignore_presence_priority'.Waqas Hussain2010-05-221-0/+10
| | |
| * | Merge with backoutMatthew Wild2010-05-211-30/+11
| |\ \
| | * | Backed out changeset c75c22c316d6 (the XMPP spec now gives a better way to ↵Matthew Wild2010-05-211-30/+11
| | | | | | | | | | | | | | | | do this)
* | | | util.sasl.scram: Fixing issue #177.Tobias Markmann2010-05-221-1/+1
| | | |
* | | | util.sasl.plain: Typo.Tobias Markmann2010-05-221-1/+1
| | | |
* | | | util.sasl.scram: Providing an API function to generate a salted password for ↵Tobias Markmann2010-05-221-1/+20
| | | | | | | | | | | | | | | | the SCRAM-SHA-1 mechanism.
* | | | util.sasl.scram: Split up long line.Tobias Markmann2010-05-221-1/+2
| | | |
* | | | util.sasl.scram: Parsing client-final-message in a more strict way. (thanks ↵Tobias Markmann2010-05-221-4/+1
| | | | | | | | | | | | | | | | Marc Santamaria)
* | | | util.sasl.scram: Fix in nonce check of client-final-message.Tobias Markmann2010-05-221-2/+2
| | | |
* | | | util.sasl.scram: Parsing client-first-message in a more strict way. (thanks ↵Tobias Markmann2010-05-221-4/+2
| | | | | | | | | | | | | | | | Marc Santamaria)
* | | | util.sasl.scram: Check nonce in client final message. Check channel binding ↵Tobias Markmann2010-05-221-12/+26
| | | | | | | | | | | | | | | | flag in client first message. Adding some TODOs on more strict parsing. (thanks Marc Santamaria)
* | | | util.sasl.plain: Removing plain_hashed authentication provider. Just do ↵Tobias Markmann2010-05-211-10/+1
| | | | | | | | | | | | | | | | hashing and comparison yourself in a plain_test authentication provider.
* | | | Merge 0.7->trunkMatthew Wild2010-05-212-33/+25
|\| | |
| * | | mod_bosh: Re-layout session object creation to make lines shorterMatthew Wild2010-05-211-4/+8
| | | |
| * | | mod_bosh: Add option consider_bosh_secure to treat BOSH sessions as ↵Matthew Wild2010-05-211-1/+3
| | | | | | | | | | | | | | | | encrypted even if they don't use HTTP (useful for when secure requests are proxied to Prosody over HTTP)
| * | | mod_privacy: Fix several possible tracebacks when either the contact is a ↵Matthew Wild2010-05-211-9/+14
| | | | | | | | | | | | | | | | host JID, or the contact isn't in your roster and you have roster group/subscription rules in place
| * | | mod_privacy: Remove validation that checks a roster group you block actually ↵Matthew Wild2010-05-211-20/+1
| | | | | | | | | | | | | | | | exists - it would be time-consuming on large rosters, and isn't important (or correct?) anyway.
* | | | Merge 0.7->trunkMatthew Wild2010-05-201-1/+10
|\| | |
| * | | mod_saslauth: Split out cyrus SASL config options into locals, and add ↵Matthew Wild2010-05-201-1/+10
| | | | | | | | | | | | | | | | support for cyrus_application_name (default: 'prosody')
* | | | Merge 0.7->trunkMatthew Wild2010-05-203-11/+22
|\| | |
| * | | usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional ↵Matthew Wild2010-05-202-5/+15
| | | | | | | | | | | | | | | | (default: not required)
| * | | util.sasl_cyrus: Support for specifying the application name (to pass to ↵Matthew Wild2010-05-201-2/+2
| | | | | | | | | | | | | | | | Cyrus SASL's init())
| * | | mod_saslauth: Add return value and error message to the Cyrus SASL ↵Matthew Wild2010-05-201-3/+4
| | | | | | | | | | | | | | | | handle_status callback
| * | | mod_saslauth: Allow the Cyrus SASL realm to be configurableMatthew Wild2010-05-201-1/+1
| | | |
* | | | Merge 0.7->trunkMatthew Wild2010-05-200-0/+0
|\| | |
| * | | net.dns: Remove redundant locals declarationMatthew Wild2010-05-201-1/+0
| | | |
| * | | net.dns: Fix dns.lookup from commit e54774bd73a7Matthew Wild2010-05-201-1/+1
| | | |
* | | | net.dns: Remove redundant locals declarationMatthew Wild2010-05-201-1/+0
| | | |
* | | | net.dns: Fix dns.lookup from commit e54774bd73a7Matthew Wild2010-05-201-1/+1
| | | |
* | | | Merge 0.7->trunkMatthew Wild2010-05-201-3/+3
|\| | |
| * | | mod_groups: Remove potentially verbose per-contact logging (thanks Flo)Matthew Wild2010-05-201-3/+3
| | | |
* | | | usermanager: Changed auth provider functions to methods.Waqas Hussain2010-05-191-14/+14
| | | |
* | | | Merge 0.7->trunkMatthew Wild2010-05-182-2/+9
|\| | |
| * | | Merge 0.6->0.7Matthew Wild2010-05-181-1/+1
| |\ \ \
| | * | | configure: Fix to allow option values containing '=' (thanks Jakub)Matthew Wild2010-05-181-1/+1
| | | | |
| * | | | net/dns: Fix socket.select timeout.Brian Cully2009-12-281-1/+8
| | | | |
* | | | | Merge 0.7->trunkMatthew Wild2010-05-181-1/+1
|\| | | |
| * | | | Merge 0.6->0.7Matthew Wild2010-05-181-1/+1
| |\| | |
| | * | | net/httpserver_listener: Ignore empty strings on incoming data.Brian Cully2010-04-281-1/+1
| | | | |
* | | | | Merge 0.7->trunkMatthew Wild2010-05-171-22/+23
|\| | | |
| * | | | Merge 0.7/MattJ with 0.7Matthew Wild2010-05-172-1/+6
| |\ \ \ \
| * \ \ \ \ Merge with 0.6Matthew Wild2010-05-174-25/+28
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | mod_bosh: Always give requests a destroy handler, so that the management of ↵Matthew Wild2010-05-171-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | each session's request array and the inactive_sessions logic can happen in one place. Simplifies everything and concludes this series of BOSH fixes.
| | * | | | mod_bosh: Fix handling of rids by not dropping requests with repeated rids ↵Matthew Wild2010-05-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | (assign them their sid instead), and always starting a session with first_rid-1.
| | * | | | mod_bosh: Remove some hacky code for pruning dead requests that hopefully ↵Matthew Wild2010-05-171-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | never gets executed - if it does there's a bug anyway.