aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 encrypted...Matthew Wild2010-05-211-1/+3
| * mod_privacy: Fix several possible tracebacks when either the contact is a hos...Matthew Wild2010-05-211-9/+14
| * mod_privacy: Remove validation that checks a roster group you block actually ...Matthew Wild2010-05-211-20/+1
* | Merge 0.7->trunkMatthew Wild2010-05-201-1/+10
|\|
| * mod_saslauth: Split out cyrus SASL config options into locals, and add suppor...Matthew Wild2010-05-201-1/+10
* | 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
| * util.sasl_cyrus: Support for specifying the application name (to pass to Cyru...Matthew Wild2010-05-201-2/+2
| * mod_saslauth: Add return value and error message to the Cyrus SASL handle_sta...Matthew Wild2010-05-201-3/+4
| * 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 e...Matthew Wild2010-05-171-13/+15
| | * | mod_bosh: Fix handling of rids by not dropping requests with repeated rids (a...Matthew Wild2010-05-171-2/+3
| | * | mod_bosh: Remove some hacky code for pruning dead requests that hopefully nev...Matthew Wild2010-05-171-5/+0
| | * | mod_bosh: Remove requests from the session table using table.remove(), preven...Matthew Wild2010-05-171-2/+5
* | | | prosodyctl: Support for the new usermanager, refactor host creation and fail ...Matthew Wild2010-05-151-6/+41
* | | | usermanager: Export new_default_provider()Matthew Wild2010-05-151-0/+2
* | | | usermanager: Handle auth providers for components.Waqas Hussain2010-05-131-2/+4
* | | | usermanager: Fix logic for per-host admin tables (thanks Maranda)Matthew Wild2010-05-121-6/+8
* | | | net.xmppclient_listener: Port to util.xmppstream \o/Matthew Wild2010-05-091-21/+18
* | | | prosody: Load util.xmppstream :(Matthew Wild2010-05-091-0/+1
* | | | util.xmppstream: Stream objects now just have feed/reset methodsMatthew Wild2010-05-091-4/+22
* | | | usermanager: Bump log level of incorrect config option warningsMatthew Wild2010-05-071-2/+2
* | | | usermanager: Fix for is_admin to work with the new auth provider architectureMatthew Wild2010-05-071-7/+16
* | | | Merge 0.7->trunkWaqas Hussain2010-05-073-3/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge 0.6->0.7Waqas Hussain2010-05-072-2/+4
| |\ \ \ | | | |/ | | |/|
| | * | mod_console: Set a chunk name for loadstring calls (nicer errors).Waqas Hussain2010-05-071-2/+3
| | * | mod_posix: Fixed a global access.Waqas Hussain2010-05-071-0/+1
| * | | mod_console: Ensure that a null byte is printed after sending the banner.Waqas Hussain2010-05-071-0/+1
| * | | prosody: Modified function metatable for better string representation of func...Waqas Hussain2010-05-071-0/+4
| * | | prosody: Lowered log level for a log message.Waqas Hussain2010-05-071-1/+1