aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-09-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Add method for deleting items from archives with same ↵Kim Alvefur2013-09-281-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syntax as :find()
| * | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Split out code for building WHERE clauses into separate ↵Kim Alvefur2013-09-281-34/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions
| * | | | | | | | | | | | | | | | | | | | | | | | | | server_select: fix onreadtimeout support so that listeners can override the ↵Matthew Wild2013-09-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default (disconnect) behaviour
| * | | | | | | | | | | | | | | | | | | | | | | | | | util.x509: Only compare identity with oid-on-xmppAddr for XMPP servicesKim Alvefur2013-09-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Simplify validation of client-first-messageKim Alvefur2013-09-221-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge Tobias SCRAM-PLUS workKim Alvefur2013-09-223-7/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Backout ae48bf828f21Kim Alvefur2013-09-222-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Only advertise mechanisms needing channel binding if a channel binding ↵Tobias Markmann2011-02-072-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backend is avaliable.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | sasl.util.scarm: Rearrage some code so it makes more sense.Tobias Markmann2011-02-061-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Checking the GS2 header for valid start flag.Tobias Markmann2011-02-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | mod_saslauth: Check whether LuaSec supports getpeerfinished() binding.Tobias Markmann2011-01-171-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Remove some debugging output.Tobias Markmann2011-01-171-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Adding reference to RFC 5929 'Channel Bindings for TLS'.Tobias Markmann2011-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Validate channel binding data of client final message.Tobias Markmann2011-01-171-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | mod_saslauth: Add channel binding handler for tls-unique channel binding.Tobias Markmann2011-01-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Use self.profile.cb for detection whether channel binding ↵Tobias Markmann2011-01-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is supported or not.
| | * | | | | | | | | | | | | | | | | | | | | | | | | | mod_saslauth: Set secure socket as SASL object user data for secure sessions.Tobias Markmann2011-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl: New method to add channel binding handler to a SASL instance.Tobias Markmann2011-01-171-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Run with own LuaSec.Tobias Markmann2011-01-172-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Check whether we support the proposed channel binding type.Tobias Markmann2011-01-152-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Adding some code for channel binding advertising.Tobias Markmann2011-01-121-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | moduleapi: Add module:unhook()Matthew Wild2013-09-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | net.server_select: Return handler from addclientKim Alvefur2013-09-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | net.server_select: Pass on all arguments to addclient on to wrapclientKim Alvefur2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager: Allow for specifying the dhparam option as a path to a file ↵Kim Alvefur2013-09-031-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of a callback
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkKim Alvefur2013-09-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-09-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_admin_adhoc: As the only user of set:items(), update... it's now an ↵Matthew Wild2013-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iterator, and the extra keys() iterator is now unnecessary
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.set: :items() now returns an iterator instead of the underlying table. ↵Matthew Wild2013-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is much more efficient than 'for item in set' (which still works for now). Current access to _items is generally done directly, this may change.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-09-034-6/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prosodyctl: check: Support for unicode (IDN) domains (thanks once again albert)Matthew Wild2013-09-021-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc: Support for locking newly-created rooms until they are configured ↵Matthew Wild2013-08-302-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (enabled with muc_room_locking = true)
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc: Import util.arrayMatthew Wild2013-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prosody.cfg.lua.dist: Set c2s_require_encryption = trueMatthew Wild2013-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-08-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_c2s: Move another log message to debug levelKim Alvefur2013-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and ↵Kim Alvefur2013-08-142-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (hopefully) less confusing way
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_s2s: Captitalize log messages that begin with a stream directionKim Alvefur2013-08-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_s2s: Lower "Beginning new connection attempt" message from info to debug ↵Kim Alvefur2013-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | level
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_s2s/s2sout.lib: Improve error message logged at 'info' level when ↵Matthew Wild2013-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failing to connect to a host. Now 'Failed in all attempts to connect to XYZ'
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.async: Make guarder() localMatthew Wild2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.async: Add guarder method, to create guards to ensure only a single ↵Matthew Wild2013-08-131-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | runner can pass through a section of code at a time
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usermanager: Remove unused import of pairs()Matthew Wild2013-08-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.async: Fix logic bug that prevented error watcher being called for runnersMatthew Wild2013-08-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.async: waiter: Throw error if done() called too many timesKim Alvefur2013-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.async: waiter: Remove restriction about wait() being called before done()Matthew Wild2013-08-121-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.async: runner: Fix check for new state to recognise transition to 'waiting'Matthew Wild2013-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.async: Make functions localMatthew Wild2013-08-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |