Skip to content
Snippets Groups Projects
Unverified Commit 904088ac authored by Guilherme Amadio's avatar Guilherme Amadio
Browse files

net/http: fix ambiguous else warning in THttpServer

parent cdfe8f22
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
net/http/src/THttpServer.cxx
+ 2
− 1
View file @ 904088ac
...@@ -142,11 +142,12 @@ THttpServer::THttpServer(const char *engine) : TNamed("http", "ROOT http server" ...@@ -142,11 +142,12 @@ THttpServer::THttpServer(const char *engine) : TNamed("http", "ROOT http server"
if (!jsrootsys) if (!jsrootsys)
jsrootsys = gEnv->GetValue("HttpServ.JSRootPath", jsrootsys); jsrootsys = gEnv->GetValue("HttpServ.JSRootPath", jsrootsys);
if (jsrootsys && *jsrootsys) if (jsrootsys && *jsrootsys) {
if ((strncmp(jsrootsys, "http://", 7)==0) || (strncmp(jsrootsys, "https://", 8)==0)) if ((strncmp(jsrootsys, "http://", 7)==0) || (strncmp(jsrootsys, "https://", 8)==0))
fJSROOT = jsrootsys; fJSROOT = jsrootsys;
else else
fJSROOTSYS = jsrootsys; fJSROOTSYS = jsrootsys;
}
if (fJSROOTSYS.Length() == 0) { if (fJSROOTSYS.Length() == 0) {
TString jsdir = TString::Format("%s/js", TROOT::GetDataDir().Data()); TString jsdir = TString::Format("%s/js", TROOT::GetDataDir().Data());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment