From a19ab13f452c7e745cd5bbf2179f24b1076c7096 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 7 Mar 2019 13:30:00 +0100
Subject: [PATCH] SONAR-11680 upgrade Tomcat to 8.5.38

---
 build.gradle                                                    | 2 +-
 .../src/main/java/org/sonar/server/app/TomcatConnectors.java    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b627b5cdc84..c3cbf44bbd8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -164,7 +164,7 @@ subprojects {
         entry 'log4j-to-slf4j'
         entry 'log4j-core'
       }
-      dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.37') {
+      dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.38') {
         entry 'tomcat-embed-core'
         entry('tomcat-embed-jasper') {
           exclude 'org.eclipse.jdt.core.compiler:ecj'
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java
index a768e41a108..e63c28cd312 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatConnectors.java
@@ -55,6 +55,8 @@ class TomcatConnectors {
     connector.setURIEncoding("UTF-8");
     connector.setProperty("address", props.value("sonar.web.host", "0.0.0.0"));
     connector.setProperty("socket.soReuseAddress", "true");
+    // see https://tomcat.apache.org/tomcat-8.5-doc/config/http.html
+    connector.setProperty("relaxedQueryChars", "\"<>[\\]^`{|}");
     configurePool(props, connector);
     configureCompression(connector);
     configureMaxHttpHeaderSize(connector);
-- 
2.39.5