prosody
db085e55555f
plugins/mod_proxy65.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

plugins/mod_proxy65.lua @ 6952:db085e55555f

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 03 Dec 2015 14:59:55 +0000
parent 6948:e6968e47826d
child 8642:d2556f237bc2
child 9642:e31053344231
comparison
equal deleted inserted replaced
6947:032313f356c9 6952:db085e55555f
89 end 89 end
90 90
91 function module.add_host(module) 91 function module.add_host(module)
92 local host, name = module:get_host(), module:get_option_string("name", "SOCKS5 Bytestreams Service"); 92 local host, name = module:get_host(), module:get_option_string("name", "SOCKS5 Bytestreams Service");
93 93
94 local proxy_address = module:get_option("proxy65_address", host); 94 local proxy_address = module:get_option_string("proxy65_address", host);
95 local proxy_port = next(portmanager.get_active_services():search("proxy65", nil)[1] or {}); 95 local proxy_port = next(portmanager.get_active_services():search("proxy65", nil)[1] or {});
96 local proxy_acl = module:get_option("proxy65_acl"); 96 local proxy_acl = module:get_option_array("proxy65_acl");
97 97
98 -- COMPAT w/pre-0.9 where proxy65_port was specified in the components section of the config 98 -- COMPAT w/pre-0.9 where proxy65_port was specified in the components section of the config
99 local legacy_config = module:get_option_number("proxy65_port"); 99 local legacy_config = module:get_option_number("proxy65_port");
100 if legacy_config then 100 if legacy_config then
101 module:log("warn", "proxy65_port is deprecated, please put proxy65_ports = { %d } into the global section instead", legacy_config); 101 module:log("warn", "proxy65_port is deprecated, please put proxy65_ports = { %d } into the global section instead", legacy_config);