| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge with tip. | Tobias Markmann | 2010-03-12 | 11 | -73/+84 |
|\ |
|
| * | Merge with trunk | Matthew Wild | 2010-03-05 | 1 | -47/+47 |
| |\ |
|
| | * | mod_offline: Convert to Unix line endings. | Waqas Hussain | 2010-03-02 | 1 | -47/+47 |
| * | | Merge with 0.7 | Matthew Wild | 2010-03-05 | 3 | -7/+14 |
| |\ \
| | |/
| |/| |
|
| | * | net.dns: Trailing whitespace | Matthew Wild | 2010-03-05 | 1 | -2/+2 |
| | * | net.dns: More reliable parsing of resolv.conf - allow multiple nameserver IPs... | Matthew Wild | 2010-03-05 | 1 | -2/+7 |
| | * | net.server_select: Fix for traceback when a read returns an error and no data... | Matthew Wild | 2010-03-05 | 1 | -1/+1 |
| | * | certmanager: Friendlier error reporting on OpenWRT and other cases where we d... | Matthew Wild | 2010-03-05 | 1 | -1/+3 |
| | * | certmanager: Fix nil global access (thanks Marc) | Matthew Wild | 2010-03-05 | 1 | -1/+1 |
| * | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 5 | -8/+8 |
| |\| |
|
| | * | util.sasl: Fixed a nil global access. | Waqas Hussain | 2010-03-02 | 1 | -1/+1 |
| | * | util.stanza: Fixed nil global accesses. | Waqas Hussain | 2010-03-02 | 1 | -3/+3 |
| | * | certmanager: Fix global access | Matthew Wild | 2010-03-01 | 1 | -1/+1 |
| | * | net.server_select: Fix typo | Matthew Wild | 2010-03-01 | 1 | -1/+1 |
| | * | net.server_event: Fix some global accesses | Matthew Wild | 2010-03-01 | 1 | -2/+2 |
| * | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 2 | -8/+8 |
| |\| |
|
| | * | mod_proxy65: Fix for old-style closing of connections (another source of trac... | Matthew Wild | 2010-03-01 | 1 | -4/+4 |
| | * | net.server_select: Fix calling method of some handler.close()s | Matthew Wild | 2010-03-01 | 1 | -4/+4 |
| * | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 1 | -3/+3 |
| |\| |
|
| | * | net.server_event: Improve and fix potential traceback in logging of new incom... | Matthew Wild | 2010-03-01 | 1 | -3/+3 |
| * | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 1 | -1/+2 |
| |\| |
|
| | * | mod_saslauth: Add FIXME to remind myself to fix this as soon as I have time | Matthew Wild | 2010-03-01 | 1 | -1/+2 |
| * | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 2 | -0/+3 |
| |\| |
|
| | * | Merge with 0.7/waqas | Matthew Wild | 2010-03-01 | 1 | -0/+1 |
| | |\ |
|
| | | * | util.sasl_cyrus: Ensure the mechanisms table is available after a failed auth... | Waqas Hussain | 2010-03-01 | 1 | -0/+1 |
| | * | | mod_saslauth: Unlock globals while loading cyrus | Matthew Wild | 2010-03-01 | 1 | -0/+2 |
| * | | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 1 | -1/+1 |
| |\| | |
|
| | * | | prosody: Bump log message describing current connection backend to level 'info' | Matthew Wild | 2010-02-27 | 1 | -1/+1 |
| | |/ |
|
* | | | util.sasl: 2009 -> 2010 in copyright header. | Tobias Markmann | 2010-03-12 | 6 | -5/+8 |
* | | | util.sasl.scram: Adjusting authentication backend name to conform with the st... | Tobias Markmann | 2010-02-28 | 1 | -2/+2 |
* | | | util.sasl.plain: Adding plain_hashed authentication backend support. | Tobias Markmann | 2010-02-28 | 1 | -1/+10 |
* | | | util.sasl.scram: Adding documentation on SCRAM authentication backend. | Tobias Markmann | 2010-02-28 | 1 | -0/+10 |
* | | | util.sasl.anonymous: Adding documentation on anonymous authentication backend. | Tobias Markmann | 2010-02-28 | 1 | -0/+10 |
* | | | util.sasl: Moving SASL authentication backends documentation to the mechanism... | Tobias Markmann | 2010-02-28 | 3 | -21/+30 |
* | | | util.sasl: Abstracting out the hash function used since SCRAM is independent ... | Tobias Markmann | 2010-02-28 | 1 | -57/+75 |
|/ / |
|
* | | Merge with 0.7 | Matthew Wild | 2010-02-25 | 1 | -1/+1 |
|\| |
|
| * | prosody.cfg.lua.dist: Fix missing quote in commented proxy config example | Matthew Wild | 2010-02-25 | 1 | -1/+1 |
* | | Merge with 0.7 | Matthew Wild | 2010-02-25 | 3 | -5/+11 |
|\| |
|
| * | Merge with 0.6 | Matthew Wild | 2010-02-25 | 2 | -5/+7 |
| |\ |
|
| | * | tests/test_core_s2smanager.lua: Fix to compare SRV weights correctly | Matthew Wild | 2010-02-25 | 1 | -4/+4 |
| | * | s2smanager: Log and fail gracefully when unable to create socket for outgoing... | Matthew Wild | 2010-02-25 | 1 | -0/+5 |
| | * | s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain) | Matthew Wild | 2010-02-25 | 1 | -1/+3 |
| | * | net.adns: Trailing whitespace | Matthew Wild | 2010-01-20 | 1 | -2/+2 |
| | * | mod_vcard: Stricter matching of vcard stanzas with vcard_compatibility enable... | Matthew Wild | 2009-12-09 | 1 | -1/+1 |
| * | | net.server_event: Add lock_read() method to connections | Matthew Wild | 2010-02-25 | 1 | -0/+4 |
* | | | Merge with 0.7 | Matthew Wild | 2010-02-22 | 1 | -3/+7 |
|\| | |
|
| * | | prosodyctl: Fix addplugin to support --help, and hide from the help listing (... | Matthew Wild | 2010-02-22 | 1 | -2/+6 |
| * | | prosodyctl: Fix 'restart' command to not report itself as the 'stop' command ... | Matthew Wild | 2010-02-22 | 1 | -1/+1 |
* | | | Merge with 0.7 | Matthew Wild | 2010-02-22 | 0 | -0/+0 |
|\| | |
|
| * | | prosodyctl.man: Update email address | Dwayne Bent | 2010-02-21 | 1 | -1/+1 |