Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2016-01-08 | 6 | -31/+52 |
|\ | |||||
| * | tests: Fix merge, modulemanager test was removed | Kim Alvefur | 2016-01-08 | 1 | -1/+0 |
| | | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2016-01-08 | 4 | -6/+48 |
| |\ | |||||
| | * | Added tag 0.9.9 for changeset 7ec52755622f | Matthew Wild | 2016-01-08 | 0 | -0/+0 |
| | | | |||||
| | * | Backout 88d54bec26b7 prior to release, as it certainly requires more testing | Matthew Wild | 2016-01-08 | 1 | -1/+3 |
| | | | |||||
| | * | mod_http_files: Santize the path relative to our base URL before translating ↵ | Matthew Wild | 2016-01-07 | 1 | -1/+33 |
| | | | | | | | | | | | | it to a filesystem path, fixes a relative path traversal vulnerability | ||||
| | * | util.uuid: Use /dev/urandom | Kim Alvefur | 2016-01-06 | 1 | -27/+16 |
| | | | |||||
| | * | net.dns: Allow a zone id in resolv.conf (eg like %eth0) | Kim Alvefur | 2016-01-04 | 1 | -1/+1 |
| | | | |||||
| | * | util.ip: Support zone id syntax in IPv6 addresses | Kim Alvefur | 2016-01-04 | 1 | -1/+5 |
| | | | |||||
| | * | net.dns: Support IPv6 addresses in resolv.conf [Backported from 0.10] | Florian Zeitz | 2013-06-18 | 1 | -6/+13 |
| | | | |||||
| | * | util.ip: Fix protocol detection of IPv6 addresses beginning with : ↵ | Matthew Wild | 2013-05-18 | 1 | -2/+4 |
| | | | | | | | | | | | | [Backported from 0.10] | ||||
| | * | util.ip: Automatically determine protocol of IP address if none specified. ↵ | Matthew Wild | 2013-05-17 | 1 | -1/+9 |
| | | | | | | | | | | | | Return error if invalid. [Backported from 0.10] | ||||
| | * | tests/test.lua: Fix fake module() function to prevent _M from being _G ↵ | Matthew Wild | 2016-01-06 | 1 | -1/+4 |
| | | | | | | | | | | | | (test.lua's environment), which caused modules to break the sandbox when they set _M.* | ||||
| * | | util.random: Use /dev/urandom | Kim Alvefur | 2016-01-06 | 1 | -24/+4 |
| | | | |||||
| * | | util.uuid: Take random byte directly instead of the low bits from the ascii ↵ | Kim Alvefur | 2016-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | value of a hex nibble | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-01-04 | 1 | -0/+2 |
|\| | | |||||
| * | | mod_bosh: Fire event when BOSH session is created | Matthew Wild | 2016-01-04 | 1 | -0/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-01-04 | 2 | -4/+5 |
|\| | | |||||
| * | | mod_admin_adhoc: Show only connections to/from the host the command was run on | Kim Alvefur | 2016-01-03 | 1 | -1/+1 |
| | | | |||||
| * | | mod_admin_adhoc: Remove extra ) that should not be there | Kim Alvefur | 2016-01-03 | 1 | -1/+1 |
| | | | |||||
| * | | server_select: Forward the actual TLS handshake error message | Kim Alvefur | 2016-01-03 | 1 | -2/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-01-02 | 3 | -0/+7 |
|\| | | |||||
| * | | net.server_select: Close all connections when quitting (and not just ↵ | Matthew Wild | 2016-01-02 | 1 | -0/+1 |
| | | | | | | | | | | | | stepping), matches server_event | ||||
| * | | net.server_event: Add conn.type == 'server' for server sockets (fixes ↵ | Matthew Wild | 2016-01-02 | 1 | -0/+1 |
| | | | | | | | | | | | | closeallservers() ) | ||||
| * | | util.events: Document data structures | Matthew Wild | 2015-12-23 | 1 | -0/+5 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-01 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_register: Fix typo | Kim Alvefur | 2016-01-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-12-27 | 11 | -129/+452 |
|\| | | |||||
| * | | certs/Makefile: Fix generating cert from only a key (no config then) | Kim Alvefur | 2015-12-24 | 1 | -2/+1 |
| | | | |||||
| * | | man prosodyctl: Add information about the 'about' and 'check' commands | Kim Alvefur | 2015-12-23 | 2 | -0/+33 |
| | | | |||||
| * | | man prosodyctl: Add missing 'reload' command | Kim Alvefur | 2015-12-23 | 2 | -1/+12 |
| | | | |||||
| * | | man prosodyctl: Accidentally markdown | Kim Alvefur | 2015-12-23 | 3 | -69/+213 |
| | | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-12-23 | 1 | -2/+2 |
| |\| | |||||
| | * | certs/Makefile: Run key generation with a stricter umask (fixes a race ↵ | Kim Alvefur | 2015-12-23 | 1 | -2/+2 |
| | | | | | | | | | | | | condition) | ||||
| | * | mod_admin_telnet: Backport 06696882d972 from 0.10 (this command greatly ↵ | Matthew Wild | 2015-12-22 | 1 | -0/+27 |
| | | | | | | | | | | | | helps with debugging HTTP issues) | ||||
| * | | certs/Makefile: Add targets for any combination of already existing config, ↵ | Kim Alvefur | 2015-12-23 | 1 | -3/+36 |
| | | | | | | | | | | | | key file | ||||
| * | | mod_register: Support for blacklisting ips that are still over limit when ↵ | Kim Alvefur | 2015-12-23 | 1 | -1/+7 |
| | | | | | | | | | | | | they get pushed out of the cache | ||||
| * | | mod_register: Use util.cache to limit the number of per-ip throttles kept | Kim Alvefur | 2015-12-23 | 1 | -3/+6 |
| | | | |||||
| * | | mod_register: Switch to using util.throttle for limiting registrations per ↵ | Kim Alvefur | 2015-12-23 | 1 | -13/+17 |
| | | | | | | | | | | | | ip per time | ||||
| * | | tests: Add small test for util.throttle | Kim Alvefur | 2015-12-23 | 2 | -0/+35 |
| | | | |||||
| * | | util.openssl: Fix style / whitespace | Kim Alvefur | 2015-12-23 | 1 | -7/+7 |
| | | | |||||
| * | | util.openssl: Rename variables for readability | Kim Alvefur | 2015-12-23 | 1 | -9/+9 |
| | | | |||||
| * | | util.openssl: Move quoting and tostring call into escape function | Kim Alvefur | 2015-12-23 | 1 | -3/+3 |
| | | | |||||
| * | | util.array: Just use table.remove as array:pop() | Kim Alvefur | 2015-12-23 | 1 | -5/+1 |
| | | | |||||
| * | | util.array: Fix minory style issues | Kim Alvefur | 2015-12-23 | 1 | -10/+10 |
| | | | |||||
| * | | mod_register: Add comment explaining the workaround for replying when the ↵ | Kim Alvefur | 2015-12-21 | 1 | -0/+1 |
| | | | | | | | | | | | | account is being deleted | ||||
| * | | mod_register: Use session log instance to ease indentification | Kim Alvefur | 2015-12-21 | 1 | -4/+6 |
| | | | |||||
| * | | util.cache (and tests): Call on_evict after insertion of the new key, so ↵ | Matthew Wild | 2015-12-22 | 2 | -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 stopped | Kim Alvefur | 2015-12-23 | 1 | -1/+10 |
| | | | |||||
* | | | mod_admin_telnet: Make timer:info command more robust | Kim Alvefur | 2015-12-23 | 1 | -12/+17 |
| | | |