Merge pull request #70 from clowwindy/master

Fix fast_open option
This commit is contained in:
Max Lv
2014-05-02 22:01:37 +08:00
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -160,7 +160,7 @@ jconf_t *read_jconf(const char* file)
}
else if (strcmp(name, "fast_open") == 0)
{
conf.fast_open = 1;
conf.fast_open = value->u.boolean;
}
}
}
+3
View File
@@ -1012,6 +1012,9 @@ int main (int argc, char **argv)
if (password == NULL) password = conf->password;
if (method == NULL) method = conf->method;
if (timeout == NULL) timeout = conf->timeout;
#ifdef TCP_FASTOPEN
if (fast_open == 0) fast_open = conf->fast_open;
#endif
}
if (server_num == 0 || server_port == NULL || password == NULL)