diff options
Diffstat (limited to 'server')
| -rwxr-xr-x | server/server/config.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp index 8159d02..dc74862 100755 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -59,13 +59,13 @@ void config::load_vars() vars.check_interval = get_int(cfg_str, "ConnListCheckInterval=", 30); vars.conn_count = get_int(cfg_str, "ConnectionCount=", 30); vars.conn_time = get_int(cfg_str, "ConnectionTimeOut=", 60); - vars.dos_conn_count = get_int(cfg_str, "DosConnectionCount=", 200); + vars.dos_conn_count = get_int(cfg_str, "DosConnectionCount=", 100); vars.debug = get_int(cfg_str, "Debug=", 0); vars.bind_ip = get_string(cfg_str, "BindAddress=", "0.0.0.0"); vars.log_path = get_string(cfg_str, "LogPath=", ""); vars.dos_log_path = get_string(cfg_str, "DosLogPath=", ""); vars.ignore_ssl_errors = get_int(cfg_str, "IgnoreSslErrors=", 0); - vars.config_reload_interval = get_int(cfg_str, "ConfigReloadInterval=", 600); + vars.config_reload_interval = get_int(cfg_str, "ConfigReloadInterval=", 6000); vars.proxy_check_interval = get_int(cfg_str, "ProxyCheckInterval=", 6000); vars.speed_test_file_url = get_string(cfg_str, "SpeedTestFileUrl=", "http://google.com"); } @@ -405,7 +405,8 @@ void config::load_static_proxy_list(char *pth) lp2 = line.size(); position = atoi(line.substr(lp1, lp2-lp1).c_str()); } - static_proxy_list.push_back(static_proxy_entry(login, password, host, port, label, position, type)); + if(type != HTTP) + static_proxy_list.push_back(static_proxy_entry(login, password, host, port, label, position, type)); p2 = cfg_str.find(';', p1); } } |