aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2016-01-107-31/+71
|\
| * tests: Add test for util.uuid (checks that the output format is correct)Kim Alvefur2016-01-102-0/+25
| |
| * tests: Correct mistake from latst merge, use the same variable name in all 3 ↵Kim Alvefur2016-01-101-2/+2
| | | | | | | | places where it matters
| * Makefile: Add 'test' target that runs testsKim Alvefur2016-01-101-0/+3
| |
| * mod_admin_telnet: c2s:count in less linesKim Alvefur2016-01-101-7/+1
| |
| * mod_admin_telnet: Show unauthenticated clients identified by local/remote IP ↵Kim Alvefur2016-01-091-1/+7
| | | | | | | | and port
| * mod_admin_telnet: c2s:show() etc, list all sessions including ↵Kim Alvefur2016-01-091-9/+20
| | | | | | | | unauthenticated or not with no stream opened
| * mod_admin_telnet: Remove compat warning about 'console_banner' as a functionKim Alvefur2016-01-101-9/+5
| |
| * net.server_select: Add 'server' method to client connections (present in ↵Kim Alvefur2016-01-091-0/+3
| | | | | | | | server_event)
| * prosodyctl: Show an example ssl config after generating a certificateKim Alvefur2016-01-091-0/+2
| |
| * rostermanager: Rename variable to avoid name clash [luacheck]Kim Alvefur2016-01-091-4/+4
| |
* | Merge 0.10->trunkKim Alvefur2016-01-086-31/+52
|\|
| * tests: Fix merge, modulemanager test was removedKim Alvefur2016-01-081-1/+0
| |
| * Merge 0.9->0.10Kim Alvefur2016-01-084-6/+48
| |\
| | * Added tag 0.9.9 for changeset 7ec52755622fMatthew Wild2016-01-080-0/+0
| | |
| | * Backout 88d54bec26b7 prior to release, as it certainly requires more testing0.9.9Matthew Wild2016-01-081-1/+3
| | |
| | * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 00:45:35 +0000