aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge with tip.Tobias Markmann2010-03-1211-73/+84
|\
| * Merge with trunkMatthew Wild2010-03-051-47/+47
| |\
| | * mod_offline: Convert to Unix line endings.Waqas Hussain2010-03-021-47/+47
| | |
| * | Merge with 0.7Matthew Wild2010-03-053-7/+14
| |\ \ | | |/ | |/|
| | * net.dns: Trailing whitespaceMatthew Wild2010-03-051-2/+2
| | |
| | * net.dns: More reliable parsing of resolv.conf - allow multiple nameserver ↵Matthew Wild2010-03-051-2/+7
| | | | | | | | | | | | IPs on one line (thanks dersd)
| | * net.server_select: Fix for traceback when a read returns an error and no ↵Matthew Wild2010-03-051-1/+1
| | | | | | | | | | | | data (thanks dersd)
| | * certmanager: Friendlier error reporting on OpenWRT and other cases where we ↵Matthew Wild2010-03-051-1/+3
| | | | | | | | | | | | don't understand the OpenSSL error
| | * certmanager: Fix nil global access (thanks Marc)Matthew Wild2010-03-051-1/+1
| | |
| * | Merge with 0.7Matthew Wild2010-03-015-8/+8
| |\|
| | * util.sasl: Fixed a nil global access.Waqas Hussain2010-03-021-1/+1
| | |
| | * util.stanza: Fixed nil global accesses.Waqas Hussain2010-03-021-3/+3
| | |
| | * certmanager: Fix global accessMatthew Wild2010-03-011-1/+1
| | |
| | * net.server_select: Fix typoMatthew Wild2010-03-011-1/+1
| | |
| | * net.server_event: Fix some global accessesMatthew Wild2010-03-011-2/+2
| | |
| * | Merge with 0.7Matthew Wild2010-03-012-8/+8
| |\|
| | * mod_proxy65: Fix for old-style closing of connections (another source of ↵Matthew Wild2010-03-011-4/+4
| | | | | | | | | | | | tracebacks with libevent enabled)
| | * net.server_select: Fix calling method of some handler.close()sMatthew Wild2010-03-011-4/+4
| | |
| * | Merge with 0.7Matthew Wild2010-03-011-3/+3
| |\|
| | * net.server_event: Improve and fix potential traceback in logging of new ↵Matthew Wild2010-03-011-3/+3
| | | | | | | | | | | | incoming connections
| * | Merge with 0.7Matthew Wild2010-03-011-1/+2
| |\|
| | * mod_saslauth: Add FIXME to remind myself to fix this as soon as I have timeMatthew Wild2010-03-011-1/+2
| | |
| * | Merge with 0.7Matthew Wild2010-03-012-0/+3
| |\|
| | * Merge with 0.7/waqasMatthew Wild2010-03-011-0/+1
| | |\
| | | * util.sasl_cyrus: Ensure the mechanisms table is available after a failed ↵Waqas Hussain2010-03-011-0/+1
| | | | | | | | | | | | | | | | auth attempt.
| | * | mod_saslauth: Unlock globals while loading cyrusMatthew Wild2010-03-011-0/+2
| | | |
| * | | Merge with 0.7Matthew Wild2010-03-011-1/+1
| |\| |
| | * | prosody: Bump log message describing current connection backend to level 'info'Matthew Wild2010-02-271-1/+1
| | |/
* | | util.sasl: 2009 -> 2010 in copyright header.Tobias Markmann2010-03-126-5/+8
| | |
* | | util.sasl.scram: Adjusting authentication backend name to conform with the ↵Tobias Markmann2010-02-281-2/+2
| | | | | | | | | | | | style already used by the plain module.
* | | util.sasl.plain: Adding plain_hashed authentication backend support.Tobias Markmann2010-02-281-1/+10
| | |
* | | util.sasl.scram: Adding documentation on SCRAM authentication backend.Tobias Markmann2010-02-281-0/+10
| | |
* | | util.sasl.anonymous: Adding documentation on anonymous authentication backend.Tobias Markmann2010-02-281-0/+10
| | |
* | | util.sasl: Moving SASL authentication backends documentation to the ↵Tobias Markmann2010-02-283-21/+30
| | | | | | | | | | | | mechanism files.
* | | util.sasl: Abstracting out the hash function used since SCRAM is independent ↵Tobias Markmann2010-02-281-57/+75
|/ / | | | | | | of it. Adding scram-{mech} authentication backend support.
* | Merge with 0.7Matthew Wild2010-02-251-1/+1
|\|
| * prosody.cfg.lua.dist: Fix missing quote in commented proxy config exampleMatthew Wild2010-02-251-1/+1
| |
* | Merge with 0.7Matthew Wild2010-02-253-5/+11
|\|
| * Merge with 0.6Matthew Wild2010-02-252-5/+7
| |\
| | * tests/test_core_s2smanager.lua: Fix to compare SRV weights correctlyMatthew Wild2010-02-251-4/+4
| | |
| | * s2smanager: Log and fail gracefully when unable to create socket for ↵Matthew Wild2010-02-251-0/+5
| | | | | | | | | | | | outgoing s2s connection (thanks foucault)
| | * s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain)Matthew Wild2010-02-251-1/+3
| | |
| | * net.adns: Trailing whitespaceMatthew Wild2010-01-201-2/+2
| | |
| | * mod_vcard: Stricter matching of vcard stanzas with vcard_compatibility ↵Matthew Wild2009-12-091-1/+1
| | | | | | | | | | | | enabled, fixes intercepting stanzas to the full JID that it shouldn't
| * | net.server_event: Add lock_read() method to connectionsMatthew Wild2010-02-251-0/+4
| | |
* | | Merge with 0.7Matthew Wild2010-02-221-3/+7
|\| |
| * | prosodyctl: Fix addplugin to support --help, and hide from the help listing ↵Matthew Wild2010-02-221-2/+6
| | | | | | | | | | | | (for now)
| * | prosodyctl: Fix 'restart' command to not report itself as the 'stop' command ↵Matthew Wild2010-02-221-1/+1
| | | | | | | | | | | | (thanks albert!)
* | | Merge with 0.7Matthew Wild2010-02-220-0/+0
|\| |
| * | prosodyctl.man: Update email addressDwayne Bent2010-02-211-1/+1
| | |