aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* util.ip: Add CIDR notation parsing and matchingMatthew Wild2013-05-181-1/+24
|
* MergeMatthew Wild2013-05-182-5/+18
|\
| * Merge 0.9->trunkKim Alvefur2013-05-182-5/+18
| |\
| | * mod_admin_telnet: Verify that the host exists in user commands (Thanks SkyBlue)Kim Alvefur2013-05-181-3/+9
| | |
| | * util.ip: Convert IPv4 mapped addresses to hex.Kim Alvefur2013-05-181-0/+7
| | |
| | * mod_admin_telnet: Don't rely on getpeerchain returning an empty listKim Alvefur2013-05-181-2/+2
| | |
* | | mod_muc: Pass actor (requesting JID) when generating the config form, and to ↵Matthew Wild2013-05-181-4/+4
| | | | | | | | | | | | the muc-config-form event handler
* | | mod_muc: Add getter/setter for 'whois' (fixes traceback)Matthew Wild2013-05-181-3/+14
|/ /
* | Merge 0.9->trunkMatthew Wild2013-05-181-2/+2
|\|
| * mod_s2s: Fix interaction between s2s_secure_auth and s2s_require_encryption, ↵Matthew Wild2013-05-181-2/+2
| | | | | | | | in particular ensure that when s2s_require_encryption is NOT set, do not require encryption on s2s_insecure_domains.
* | mod_admin_telnet: Use stanza:get_child_text()Kim Alvefur2013-05-171-6/+1
| |
* | prosodyctl: check dns: Use socket.local_addresses() if availableMatthew Wild2013-05-171-1/+20
| |
* | prosodyctl: check dns: Whitespace fix in outputMatthew Wild2013-05-171-1/+1
| |
* | prosodyctl: check dns: More concise output (merged separate v4/v6 warnings)Matthew Wild2013-05-171-4/+9
| |
* | prosodyctl: check dns: Correctly mark host as failed if expected SRV records ↵Matthew Wild2013-05-171-0/+2
| | | | | | | | are not found
* | util.ip: Add 'private' method/property to determine whether an IP address is ↵Matthew Wild2013-05-171-0/+15
| | | | | | | | generally expected to be internet-routeable (YMMV)
* | util.ip: Automatically determine protocol of IP address if none specified. ↵Matthew Wild2013-05-171-1/+9
| | | | | | | | Return error if invalid.
* | mod_admin_telnet: List session flags (encryption, compression etc) the same ↵Kim Alvefur2013-05-171-18/+20
| | | | | | | | way for c2s as s2s
* | prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the ↵Matthew Wild2013-05-171-1/+142
| | | | | | | | server's DNS records
* | prosodyctl: Add 'check' command, which currently checks the config file for ↵Matthew Wild2013-05-171-0/+52
| | | | | | | | some common mistakes
* | util.iterators: Small fix for variable scoping issueMatthew Wild2013-05-171-1/+1
| |
* | util.iterators: Add filter() to run results through a filter functionMatthew Wild2013-05-171-1/+15
| |
* | util.iterators: Various fixes and improvements, primarily use pack() where ↵Matthew Wild2013-05-171-8/+12
| | | | | | | | it should be used.
* | mod_muc: Refactor config form handling, and allow for clients to submit ↵Matthew Wild2013-05-162-81/+46
| | | | | | | | incomplete forms. Fixes #246
* | mod_admin_telnet: Add server:memory() command to view details of Prosody's ↵Matthew Wild2013-05-161-0/+21
| | | | | | | | memory usage
* | Merge 0.9->trunkMatthew Wild2013-05-143-0/+7
|\|
| * mod_muc: Fire muc-room-created and muc-room-destroyed events (thanks nik)Matthew Wild2013-05-142-0/+2
| |
| * util.hashes: inttypes.h not available with MS Windows SDK, use MS specific ↵Waqas Hussain2013-05-131-0/+5
| | | | | | | | __int32 instead.
* | Merge merge merge mergeMatthew Wild2013-05-110-0/+0
|\ \
| * \ Merge 0.9->trunkKim Alvefur2013-05-101-1/+1
| |\ \
* | \ \ Merge 0.9->trunkMatthew Wild2013-05-112-6/+7
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | prosody.cfg.lua.dist: Fix my s2s_secure(_auth) messMatthew Wild2013-05-111-5/+6
| |/
| * mod_c2s: Fix session:close() when a stanza is passed as reasonKim Alvefur2013-05-101-1/+1
| |
* | Merge 0.9->trunkMatthew Wild2013-05-101-3/+0
|\|
| * mod_pubsub: Remove nodeid check added in 989acb4ad1de that wasn't neededKim Alvefur2013-05-091-3/+0
| |
* | Merge 0.9->trunkMatthew Wild2013-05-104-195/+203
|\|
| * mod_admin_telnet: Add some DNS commands.Kim Alvefur2013-05-071-0/+41
| |
| * net.dns: Add nicer API to cached recordsKim Alvefur2013-05-071-0/+4
| |
| * util.json: New, faster, stricter, more compliant JSON decoder. Now returns ↵Waqas Hussain2013-05-071-192/+155
| | | | | | | | nil,err instead of throwing errors on invalid input.
| * util.array: Wrap tostring() output in {} (otherwise empty arrays print as "").Waqas Hussain2013-05-071-1/+1
| |
| * util.json: Make setmetatable local.Waqas Hussain2013-05-061-1/+1
| |
| * util.json: Fix variable name typo which broke util.json when util.array was ↵Waqas Hussain2013-05-061-1/+1
| | | | | | | | missing.
| * util.json: Optimize long string parsing.Waqas Hussain2013-05-051-5/+5
| |
* | Merge tls branchMatthew Wild2013-05-010-0/+0
|\ \
| * | Close 'tls' branchorigin/vault/tlsorigin/tlstlsMatthew Wild2013-05-010-0/+0
| | |
* | | Merge s2s branchMatthew Wild2013-05-010-0/+0
|\ \ \
| * | | Close 's2s' branchorigin/vault/s2sorigin/s2ss2sMatthew Wild2013-05-010-0/+0
| | | |
* | | | Merge sasl branchMatthew Wild2013-05-010-0/+0
|\ \ \ \
| * | | | Close 'sasl' branchorigin/vault/saslorigin/saslsaslMatthew Wild2013-05-010-0/+0
| | | | |
* | | | | Merge 0.9->trunkMatthew Wild2013-05-018-27/+82
|\ \ \ \ \ | | |_|_|/ | |/| | |