aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 0.9Matthew Wild2012-02-251-1/+6
|\
| * core.s2smanager: Fix check_cert_status() for when the stream has no from attrKim Alvefur2012-02-211-1/+6
| |
* | s2smanager: Fix traceback when socket.tcp6 isn't availableMatthew Wild2012-02-251-1/+1
| |
* | Merge with 0.9Matthew Wild2012-02-121-1/+1
|\|
| * hostmanager: Import select() (thanks Medics)Matthew Wild2012-02-121-1/+1
| |
* | Merge with 0.9Matthew Wild2012-02-121-4/+2
|\|
| * mod_saslauth: Remove useless import of, and call to nodeprep.Kim Alvefur2012-02-121-3/+0
| |
| * mod_saslauth: Fire authentication-failure if make_authenticated() failed.Kim Alvefur2012-02-121-0/+1
| |
| * mod_saslauth: Move authentication-success event to after session has been ↵Kim Alvefur2012-02-121-1/+1
| | | | | | | | made authenticated.
* | Merge with 0.9Matthew Wild2012-02-112-3/+4
|\|
| * hostmanager: Import jid_split (thanks chris)Matthew Wild2012-02-111-0/+1
| |
| * util.prosodyctl: Fix variable name clash introduced in 55ef5d83d00a (thanks ↵Matthew Wild2012-02-111-3/+3
| | | | | | | | chris)
* | Merge with 0.9Matthew Wild2012-02-082-2/+6
|\|
| * util.prosodyctl: In the register command, check that the virtual exists ↵Kim Alvefur2012-02-081-1/+5
| | | | | | | | before proceeding.
| * hostmanager: Add send() method to hostsMatthew Wild2011-12-161-0/+12
| |
| * prosody.cfg.lua.dist: Comment mod_legacyauth by default (thanks Zash)Matthew Wild2012-01-311-1/+1
| |
* | tools/ejabberdsql2prosody: Handle INSERT statement form where column list is ↵Waqas Hussain2012-02-051-1/+6
| | | | | | | | specified (by skipping the column list).
* | util.template: Refactoring to make the string->stanza conversion code more ↵Waqas Hussain2012-02-051-1/+15
| | | | | | | | generic.
* | Merge with 0.9Matthew Wild2012-01-262-3/+5
|\|
| * s2smanager: Log the host when marking it authenticatedPaul Aurich2012-01-241-1/+1
| |
| * mod_saslauth: "" ~= nil (thanks, Zash!)Paul Aurich2012-01-241-2/+4
| |
| * util.json: Added function encode_ordered(object).Waqas Hussain2012-01-181-6/+25
| |
| * util.dataforms: Fix verfication for booleansFlorian Zeitz2011-12-031-1/+1
| |
| * util.dataforms: Fix form verificationFlorian Zeitz2011-12-021-7/+13
| |
* | Merge with ZashMatthew Wild2012-01-263-0/+225
|\ \
| * | prosodyctl: Add commands for generating certificates and keysKim Alvefur2012-01-201-0/+101
| | |
| * | user.x509: Add some utility functions for generating OpenSSL configsKim Alvefur2012-01-201-0/+109
| | |
| * | util.prosodyctl: Add getline() and show_prompt()Kim Alvefur2012-01-201-0/+15
| | |
* | | util.xmppstream: Optimize attribute processing.Waqas Hussain2012-01-251-10/+9
| | |
* | | util.xmppstream: Have faith in the XML parser matching start and end tags.Waqas Hussain2012-01-251-10/+2
| | |
* | | util.xmppstream: Remove some unnecessary code.Waqas Hussain2012-01-251-2/+0
|/ /
* | mod_compression: Change default compression level to 7Kim Alvefur2012-01-191-1/+1
| |
* | mod_compression: Use get_option_numberKim Alvefur2012-01-191-5/+1
| |
* | Merge with trunkMatthew Wild2012-01-181-6/+25
|\ \
| * | util.json: Added function encode_ordered(object).Waqas Hussain2012-01-181-6/+25
| | |
* | | Merge with 0.9Matthew Wild2012-01-181-1/+1
|\ \ \ | | |/ | |/|
| * | mod_watchregistrations: Fixed an undefined global access (thanks Medics).Waqas Hussain2011-12-121-1/+1
| | |
| * | prosodyctl: Adjust description of 'reload' command (thanks crocket)Matthew Wild2012-01-171-1/+1
| | |
* | | mod_tls: Fix log statement (thanks Zash)Matthew Wild2012-01-181-1/+1
| |/ |/|
* | xmppserver_listener: Only re-attempt connection on disconnect if it was an ↵Matthew Wild2012-01-171-1/+1
| | | | | | | | unauthenticated s2sout (thanks Medics for the log)
* | Merge with 0.9Matthew Wild2012-01-171-2/+2
|\|
| * net.http: Pass response object to callbacks (feels hacky, should this be ↵Matthew Wild2012-01-171-2/+2
| | | | | | | | passed *instead of* the request?)
| * util.throttle: Fix 'outstanding' return valueMatthew Wild2012-01-131-1/+1
| |
| * util.throttle: Import setmetatableMatthew Wild2012-01-131-0/+1
| |
* | net.server_event: Fix :pause() to actually stop reading from the socket, ↵Matthew Wild2012-01-161-1/+8
| | | | | | | | rather than ignoring socket-readable events (!), and :resume() to restart the event listener
* | util.throttle: Fix 'outstanding' return valueMatthew Wild2012-01-131-1/+1
| |
* | util.throttle: Import setmetatableMatthew Wild2012-01-131-0/+1
| |
* | util.debug: Adjust level within get_locals_table() to account for the ↵Matthew Wild2012-01-131-0/+1
| | | | | | | | additional depth of this function itself
* | mod_component: removed unused variable reference, added "flagging" to assert ↵Marco Cirillo2012-01-061-2/+2
| | | | | | | | if a component is connected or not.
* | net.xmppcomponent_listener: removed unused variable reference.Marco Cirillo2012-01-061-2/+0
| |