aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/
* | 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
| | |
| * | prosodyctl.man: Include new restart commandDwayne Bent2010-02-211-0/+4
| | |
* | | Merge with 0.7Matthew Wild2010-02-221-1/+1
|\| |
| * | mod_console: Uncomment the help for server:shutdown() - thanks darkrainMatthew Wild2010-02-221-1/+1
| | |
* | | prosodyctl.man: Update email addressDwayne Bent2010-02-211-1/+1
| | |
* | | prosodyctl.man: Include new restart commandDwayne Bent2010-02-211-0/+4
| | |
* | | Merge with 0.7Matthew Wild2010-02-211-0/+13
|\| |
| * | prosodyctl: Add restart command for KSid and johnny :)Matthew Wild2010-02-211-0/+13
| | |
* | | Merge with 0.7Matthew Wild2010-02-212-76/+104
|\| |
| * | prosody.cfg.lua.dist: Update config for 0.7, most improvements from the Arch ↵Matthew Wild2010-02-211-75/+103
| | | | | | | | | | | | Linux package by dbb, thanks!
| * | ejabberd2prosody: Don't print passwords of imported accountsMatthew Wild2010-02-211-1/+1
| | |
* | | Merge trunk with trunkMatthew Wild2010-02-210-0/+0
|\ \ \
| * \ \ Merge with 0.7.Waqas Hussain2010-02-212-0/+13
| |\ \ \
* | \ \ \ Merge 0.7 with 0.7 with trunk \o/Matthew Wild2010-02-212-0/+13
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge 0.7 with 0.7Matthew Wild2010-02-212-0/+13
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mod_iq: Fire sub-events for iq/self events.Waqas Hussain2010-02-211-0/+12
| | | | |
| | * | | stanza_router: Make sure /self events are fired when the 'to' attribute is ↵Waqas Hussain2010-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | missing.