diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-12-03 14:59:55 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-12-03 14:59:55 +0000 |
| commit | 2b9a7ef7b48519a64f64268f4b4169c601175e93 (patch) | |
| tree | 0a45f803690602626615b39fd3c0b17e3df266e7 /plugins/mod_proxy65.lua | |
| parent | ab8006e6152db2531cfc65fbfa4de95efa570d6d (diff) | |
| parent | d3b6588fd79e85777cf5c6af4fd870c297dc7daf (diff) | |
| download | prosody-2b9a7ef7b48519a64f64268f4b4169c601175e93.tar.gz prosody-2b9a7ef7b48519a64f64268f4b4169c601175e93.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_proxy65.lua')
| -rw-r--r-- | plugins/mod_proxy65.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua index 73527cbc..cbbfad12 100644 --- a/plugins/mod_proxy65.lua +++ b/plugins/mod_proxy65.lua @@ -91,9 +91,9 @@ end function module.add_host(module) local host, name = module:get_host(), module:get_option_string("name", "SOCKS5 Bytestreams Service"); - local proxy_address = module:get_option("proxy65_address", host); + local proxy_address = module:get_option_string("proxy65_address", host); local proxy_port = next(portmanager.get_active_services():search("proxy65", nil)[1] or {}); - local proxy_acl = module:get_option("proxy65_acl"); + local proxy_acl = module:get_option_array("proxy65_acl"); -- COMPAT w/pre-0.9 where proxy65_port was specified in the components section of the config local legacy_config = module:get_option_number("proxy65_port"); |