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 | 5656b525d3b72b09964fe9fbc2b70ceda54ab66b (patch) | |
| tree | 0a45f803690602626615b39fd3c0b17e3df266e7 /plugins/mod_proxy65.lua | |
| parent | 630248084188d2bbc01da354ec022db6b18aebc7 (diff) | |
| parent | cf88b880cd19bd21161f6b3e8688fb752a96f64d (diff) | |
| download | prosody-5656b525d3b72b09964fe9fbc2b70ceda54ab66b.tar.gz prosody-5656b525d3b72b09964fe9fbc2b70ceda54ab66b.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"); |