diff options
| author | Alex Borisov <b0ric.alex@gmail.com> | 2012-01-16 02:22:10 +0200 |
|---|---|---|
| committer | Alex Borisov <b0ric.alex@gmail.com> | 2012-01-16 02:22:10 +0200 |
| commit | d6a0738689f7691d85971baed024b78840c3a680 (patch) | |
| tree | 649bef73568be2662b238a7a96fb5dac47855c06 | |
| parent | d3f5a1e20f159287764d3090ad0024ef42812709 (diff) | |
| parent | e05401e7f26562fc7d24df0ae48cc8c284b08092 (diff) | |
Merge branch 'master' of ssh://sss.chaoslab.ru/home/private_git/proxy_ui
| -rwxr-xr-x | server/server/config.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp index ddc6983..abfa11d 100755 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -68,7 +68,7 @@ void config::load_vars() vars.ignore_ssl_errors = get_int(cfg_str, "IgnoreSslErrors=", 0); vars.config_reload_interval = get_int(cfg_str, "ConfigReloadInterval=", 600); vars.proxy_check_interval = get_int(cfg_str, "ProxyCheckInterval=", 6000); - vars.speed_test_file_url = get_string(cfg_str, "SpeedTestFileUrl=", "http://localhost/speed.test"); + vars.speed_test_file_url = get_string(cfg_str, "SpeedTestFileUrl=", "http://google.com"); } } @@ -114,7 +114,7 @@ config::config(const char *pth): cfg_reload_thr(NULL), speed_test_thr(NULL) load_upload_list(); load_servers_list(); cfg_reload_thr = new boost::thread(boost::bind(reload_config_thread_func, this, &lists_mutex)); - speed_test_thr = new boost::thread(boost::bind(speed_test_thread_func, &proxy_list, &static_proxy_list, "http://sss.chaoslab.ru", &lists_mutex)); + speed_test_thr = new boost::thread(boost::bind(speed_test_thread_func, &proxy_list, &static_proxy_list, vars.speed_test_file_url, &lists_mutex)); } const int config::get_int(const std::string& data, const char* var, int default_) { |