| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 ↵ | Matthew Wild | 2010-03-05 | 1 | -2/+7 |
| | | | | | | | | | IPs on one line (thanks dersd) | ||||
| | * | net.server_select: Fix for traceback when a read returns an error and no ↵ | Matthew Wild | 2010-03-05 | 1 | -1/+1 |
| | | | | | | | | | data (thanks dersd) | ||||
| | * | certmanager: Friendlier error reporting on OpenWRT and other cases where we ↵ | Matthew Wild | 2010-03-05 | 1 | -1/+3 |
| | | | | | | | | | don't understand the OpenSSL error | ||||
| | * | 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 ↵ | Matthew Wild | 2010-03-01 | 1 | -4/+4 |
| | | | | | | | | | tracebacks with libevent enabled) | ||||
| | * | 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 ↵ | Matthew Wild | 2010-03-01 | 1 | -3/+3 |
| | | | | | | | | | incoming connections | ||||
| * | | 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 ↵ | Waqas Hussain | 2010-03-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | auth attempt. | ||||
| | * | | 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 |
| | |/ | |||||
| * | | 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 ↵ | Matthew Wild | 2010-02-25 | 1 | -0/+5 |
| | | | | | | | | | | | | | outgoing s2s connection (thanks foucault) | ||||
| | | * | 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 ↵ | Matthew Wild | 2009-12-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | enabled, fixes intercepting stanzas to the full JID that it shouldn't | ||||
| | * | | 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 |
| | | | | | | | | | | | | | (for now) | ||||
| | * | | prosodyctl: Fix 'restart' command to not report itself as the 'stop' command ↵ | Matthew Wild | 2010-02-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | (thanks albert!) | ||||
| * | | | 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 |
| | | | | |||||
| | * | | prosodyctl.man: Include new restart command | Dwayne Bent | 2010-02-21 | 1 | -0/+4 |
| | | | | |||||
| * | | | Merge with 0.7 | Matthew Wild | 2010-02-22 | 1 | -1/+1 |
| |\| | | |||||
| | * | | mod_console: Uncomment the help for server:shutdown() - thanks darkrain | Matthew Wild | 2010-02-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | prosodyctl.man: Update email address | Dwayne Bent | 2010-02-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | prosodyctl.man: Include new restart command | Dwayne Bent | 2010-02-21 | 1 | -0/+4 |
| | | | | |||||
| * | | | Merge with 0.7 | Matthew Wild | 2010-02-21 | 1 | -0/+13 |
| |\| | | |||||
| | * | | prosodyctl: Add restart command for KSid and johnny :) | Matthew Wild | 2010-02-21 | 1 | -0/+13 |
| | | | | |||||
| * | | | Merge with 0.7 | Matthew Wild | 2010-02-21 | 2 | -76/+104 |
| |\| | | |||||
 |
index : prosody.git | |
| unofficial mirror of the prosody mercurial project |
| aboutsummaryrefslogtreecommitdiffstats |