aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * mod_http_files: Santize the path relative to our base URL before translating ↵Matthew Wild2016-01-071-1/+33
| | | | | | | | | | | | it to a filesystem path, fixes a relative path traversal vulnerability
| | * util.uuid: Use /dev/urandomKim Alvefur2016-01-061-27/+16
| | |
| | * net.dns: Allow a zone id in resolv.conf (eg like %eth0)Kim Alvefur2016-01-041-1/+1
| | |
| | * util.ip: Support zone id syntax in IPv6 addressesKim Alvefur2016-01-041-1/+5
| | |
| | * net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10]Florian Zeitz2013-06-181-6/+13
| | |
| | * util.ip: Fix protocol detection of IPv6 addresses beginning with : ↵Matthew Wild2013-05-181-2/+4
| | | | | | | | | | | | [Backported from 0.10]
| | * util.ip: Automatically determine protocol of IP address if none specified. ↵Matthew Wild2013-05-171-1/+9
| | | | | | | | | | | | Return error if invalid. [Backported from 0.10]
| | * tests/test.lua: Fix fake module() function to prevent _M from being _G ↵Matthew Wild2016-01-061-1/+4
| | | | | | | | | | | | (test.lua's environment), which caused modules to break the sandbox when they set _M.*
| * | util.random: Use /dev/urandomKim Alvefur2016-01-061-24/+4
| | |
| * | util.uuid: Take random byte directly instead of the low bits from the ascii ↵Kim Alvefur2016-01-061-1/+1
| | | | | | | | | | | | value of a hex nibble
* | | Merge 0.10->trunkMatthew Wild2016-01-041-0/+2
|\| |
| * | mod_bosh: Fire event when BOSH session is createdMatthew Wild2016-01-041-0/+2
| | |
* | | Merge 0.10->trunkMatthew Wild2016-01-042-4/+5
|\| |
| * | mod_admin_adhoc: Show only connections to/from the host the command was run onKim Alvefur2016-01-031-1/+1
| | |
| * | mod_admin_adhoc: Remove extra ) that should not be thereKim Alvefur2016-01-031-1/+1
| | |
| * | server_select: Forward the actual TLS handshake error messageKim Alvefur2016-01-031-2/+3
| | |
* | | Merge 0.10->trunkMatthew Wild2016-01-023-0/+7
|\| |
| * | net.server_select: Close all connections when quitting (and not just ↵Matthew Wild2016-01-021-0/+1
| | | | | | | | | | | | stepping), matches server_event
| * | net.server_event: Add conn.type == 'server' for server sockets (fixes ↵Matthew Wild2016-01-021-0/+1
| | | | | | | | | | | | closeallservers() )
| * | util.events: Document data structuresMatthew Wild2015-12-231-0/+5
| | |
* | | Merge 0.10->trunkKim Alvefur2016-01-011-1/+1
|\| |
| * | mod_register: Fix typoKim Alvefur2016-01-011-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2015-12-2711-129/+452
|\| |
| * | certs/Makefile: Fix generating cert from only a key (no config then)Kim Alvefur2015-12-241-2/+1
| | |
| * | man prosodyctl: Add information about the 'about' and 'check' commandsKim Alvefur2015-12-232-0/+33
| | |
| * | man prosodyctl: Add missing 'reload' commandKim Alvefur2015-12-232-1/+12
| | |
| * | man prosodyctl: Accidentally markdownKim Alvefur2015-12-233-69/+213
| | |
| * | Merge 0.9->0.10Kim Alvefur2015-12-231-2/+2
| |\|
| | * certs/Makefile: Run key generation with a stricter umask (fixes a race ↵Kim Alvefur2015-12-231-2/+2
| | | | | | | | | | | | condition)
| | * mod_admin_telnet: Backport 06696882d972 from 0.10 (this command greatly ↵Matthew Wild2015-12-221-0/+27
| | | | | | | | | | | | helps with debugging HTTP issues)
| * | certs/Makefile: Add targets for any combination of already existing config, ↵Kim Alvefur2015-12-231-3/+36
| | | | | | | | | | | | key file
| * | mod_register: Support for blacklisting ips that are still over limit when ↵Kim Alvefur2015-12-231-1/+7
| | | | | | | | | | | | they get pushed out of the cache
| * | mod_register: Use util.cache to limit the number of per-ip throttles keptKim Alvefur2015-12-231-3/+6
| | |
| * | mod_register: Switch to using util.throttle for limiting registrations per ↵Kim Alvefur2015-12-231-13/+17
| | | | | | | | | | | | ip per time
| * | tests: Add small test for util.throttleKim Alvefur2015-12-232-0/+35
| | |
| * | util.openssl: Fix style / whitespaceKim Alvefur2015-12-231-7/+7
| | |
| * | util.openssl: Rename variables for readabilityKim Alvefur2015-12-231-9/+9
| | |
| * | util.openssl: Move quoting and tostring call into escape functionKim Alvefur2015-12-231-3/+3
| | |
| * | util.array: Just use table.remove as array:pop()Kim Alvefur2015-12-231-5/+1
| | |
| * | util.array: Fix minory style issuesKim Alvefur2015-12-231-10/+10
| | |
| * | mod_register: Add comment explaining the workaround for replying when the ↵Kim Alvefur2015-12-211-0/+1
| | | | | | | | | | | | account is being deleted
| * | mod_register: Use session log instance to ease indentificationKim Alvefur2015-12-211-4/+6
| | |
| * | util.cache (and tests): Call on_evict after insertion of the new key, so ↵Matthew Wild2015-12-222-5/+61
| | | | | | | | | | | | inside on_evict we can be more certain about the current state of the cache (i.e. full, new item added, old item removed)
* | | util.timer: Reschedule timers from stop() if the next pending event is stoppedKim Alvefur2015-12-231-1/+10
| | |
* | | mod_admin_telnet: Make timer:info command more robustKim Alvefur2015-12-231-12/+17
| | |
* | | Merge 0.10->trunkMatthew Wild2015-12-163-5/+8
|\| |
| * | Merge 0.9->0.10Matthew Wild2015-12-161-1/+1
| |\|
| | * MUC: Fix incorrect nesting of status codes when room config changes (fixes #579)Matthew Wild2015-12-161-1/+2
| | |
| | * util.uuid: Remove unused importKim Alvefur2015-12-081-1/+0
| | |
| * | MergeMatthew Wild2015-12-163-48/+105
| |\ \