summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2011-10-31 23:45:43 +0200
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2011-10-31 23:45:43 +0200
commita6e060642537eadc3785a19f2b6daac0f63c5179 (patch)
tree3f32425783d1d5812c7ef092bcf09e6bd5e911d6 /server
parentaf4eb3430230f9b74a8b46e4f1ebd8b214a27dac (diff)
modified: config.cpp
Diffstat (limited to 'server')
-rw-r--r--server/server/config.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp
index 3efadf5..7c85daf 100644
--- a/server/server/config.cpp
+++ b/server/server/config.cpp
@@ -61,11 +61,9 @@ void config::load_proxy_list(char *pth)
config.close();
if(!cfg_str.empty())
{
- std::string::size_type p1 = 0, p2 = 0, l = 0;
+ std::string::size_type p1 = 0, p2 = 0, l = 1;
if(cfg_str.find("\r\n") != std::string::npos)
l = 2;
- else
- l = 1;
p2 = cfg_str.find(';');
while(p2 != std::string::npos)
{
@@ -131,11 +129,9 @@ void config::load_static_proxy_list(char *pth)
config.close();
if(!cfg_str.empty())
{
- std::string::size_type p1 = 0, p2 = 0, l =0;
+ std::string::size_type p1 = 0, p2 = 0, l = 1;
if(cfg_str.find("\r\n") != std::string::npos)
l = 2;
- else
- l = 1;
p2 = cfg_str.find(';');
while(p2 != std::string::npos)
{