Skip to content

http: increase websocket timeout to 300 s #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bellenot merged 2 commits into from
Apr 13, 2017
Merged

http: increase websocket timeout to 300 s #503

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c255811
http: increase websocket timeout to 300 s
linev Apr 13, 2017
cda4ea7
http: travis formatting
linev Apr 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
http: increase websocket timeout to 300 s 
One also can configure websocket timeout when creating THttpServer
  • Loading branch information
@linev
linev committed Apr 13, 2017
commit c255811b037cc204d7e7cf6ea4ddc94408c01edc
9 changes: 7 additions & 2 deletions net/http/src/TCivetweb.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ Int_t TCivetweb::ProcessLog(const char *message)
/// top=name - configure top name, visible in the web browser
/// auth_file=filename - authentication file name, created with htdigets utility
/// auth_domain=domain - authentication domain
/// websocket_timeout=tm - set web sockets timeout in seconds (default 300)
/// loopback - bind specified port to loopback 127.0.0.1 address
/// debug - enable debug mode, server always returns html page with request info

Expand All @@ -369,8 +370,7 @@ Bool_t TCivetweb::Create(const char *args)
memset(fCallbacks, 0, sizeof(struct mg_callbacks));
//((struct mg_callbacks *) fCallbacks)->begin_request = begin_request_handler;
((struct mg_callbacks *)fCallbacks)->log_message = log_message_handler;
TString sport = "8080";
TString num_threads = "5";
TString sport = "8080", num_threads = "5", websocket_timeout = "300000";
TString auth_file, auth_domain, log_file;

// extract arguments
Expand Down Expand Up @@ -404,6 +404,9 @@ Bool_t TCivetweb::Create(const char *args)
const char *adomain = url.GetValueFromOptions("auth_domain");
if (adomain != 0) auth_domain = adomain;

Int_t wtmout = url.GetIntValueFromOptions("websocket_timeout");
if (wtmout>0) websocket_timeout.Format("%d", wtmout*1000);

if (url.HasOption("debug")) fDebug = kTRUE;

if (url.HasOption("loopback") && (sport.Index(":") == kNPOS)) sport = TString("127.0.0.1:") + sport;
Expand All @@ -420,6 +423,8 @@ Bool_t TCivetweb::Create(const char *args)
options[op++] = sport.Data();
options[op++] = "num_threads";
options[op++] = num_threads.Data();
options[op++] = "websocket_timeout_ms";
options[op++] = websocket_timeout.Data();

if ((auth_file.Length() > 0) && (auth_domain.Length() > 0)) {
options[op++] = "global_auth_file";
Expand Down