From 0e8778e954c983efdf721eb4a6860f1871154043 Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Tue, 22 Aug 2017 19:09:07 +0200
Subject: [PATCH] http: also for webcanvas disable content caching in draw.htm
---
net/http/src/THttpServer.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/http/src/THttpServer.cxx b/net/http/src/THttpServer.cxx
index d48a33c85ca..971e9ade4b4 100644
--- a/net/http/src/THttpServer.cxx
+++ b/net/http/src/THttpServer.cxx
@@ -703,7 +703,7 @@ void THttpServer::ProcessRequest(THttpCallArg *arg)
arg->fContent.ReplaceAll("=\"jsrootsys/", repl);
}
- if ((arg->fQuery.Index("no_h_json") == kNPOS) && (arg->fContent.Index(hjsontag) != kNPOS)) {
+ if ((arg->fQuery.Index("no_h_json") == kNPOS) && (arg->fQuery.Index("webcanvas") == kNPOS) && (arg->fContent.Index(hjsontag) != kNPOS)) {
TString h_json;
TRootSnifferStoreJson store(h_json, kTRUE);
const char *topname = fTopName.Data();
@@ -713,7 +713,7 @@ void THttpServer::ProcessRequest(THttpCallArg *arg)
arg->fContent.ReplaceAll(hjsontag, h_json);
}
- if ((arg->fQuery.Index("no_root_json") == kNPOS) && (arg->fContent.Index(rootjsontag) != kNPOS)) {
+ if ((arg->fQuery.Index("no_root_json") == kNPOS) && (arg->fQuery.Index("webcanvas") == kNPOS) && (arg->fContent.Index(rootjsontag) != kNPOS)) {
TString str;
void *bindata = 0;
Long_t bindatalen = 0;
--
GitLab