Disabled Websockets by default.

Due to a possible crash, WebSockets are disabled until their
implementation is completed.
master
Nicolas Favre-Felix 13 years ago
parent 2eba190a0d
commit 33f9a2f01e

@ -180,7 +180,7 @@ http_client_on_message_complete(struct http_parser *p) {
} }
c->http_version = c->parser.http_minor; c->http_version = c->parser.http_minor;
if(p->upgrade) { /* WebSocket, don't execute just yet */ if(p->upgrade && c->w->s->cfg->websockets) { /* WebSocket, don't execute just yet */
c->is_websocket = 1; c->is_websocket = 1;
return 0; return 0;
} }

@ -83,6 +83,8 @@ conf_read(const char *filename) {
else conf->verbosity = (log_level)tmp; else conf->verbosity = (log_level)tmp;
} else if(strcmp(json_object_iter_key(kv), "daemonize") == 0 && json_typeof(jtmp) == JSON_TRUE) { } else if(strcmp(json_object_iter_key(kv), "daemonize") == 0 && json_typeof(jtmp) == JSON_TRUE) {
conf->daemonize = 1; conf->daemonize = 1;
} else if(strcmp(json_object_iter_key(kv), "websockets") == 0 && json_typeof(jtmp) == JSON_TRUE) {
conf->websockets = 1;
} else if(strcmp(json_object_iter_key(kv), "database") == 0 && json_typeof(jtmp) == JSON_INTEGER) { } else if(strcmp(json_object_iter_key(kv), "database") == 0 && json_typeof(jtmp) == JSON_INTEGER) {
conf->database = json_integer_value(jtmp); conf->database = json_integer_value(jtmp);
} else if(strcmp(json_object_iter_key(kv), "pool_size") == 0 && json_typeof(jtmp) == JSON_INTEGER) { } else if(strcmp(json_object_iter_key(kv), "pool_size") == 0 && json_typeof(jtmp) == JSON_INTEGER) {

@ -22,6 +22,9 @@ struct conf {
/* daemonize process, off by default */ /* daemonize process, off by default */
int daemonize; int daemonize;
/* WebSocket support, off by default */
int websockets;
/* database number */ /* database number */
int database; int database;

@ -9,6 +9,7 @@
"threads": 3, "threads": 3,
"daemonize": false, "daemonize": false,
"websockets": false,
"database": 0, "database": 0,

Loading…
Cancel
Save