From 8d29b71fc8ad8b400c72564d4dc337ce5ddaf55f Mon Sep 17 00:00:00 2001
From: German Ferrari Argacha <gferrari@wad.bcu.gub.uy>
Date: Mon, 20 Nov 2017 18:58:29 -0300
Subject: [PATCH] XDOCKER-38: Adds system properties to setenv.sh to allow '/'
 and '\' in wiki pages

---
 8/mysql-tomcat/tomcat/setenv.sh    | 2 +-
 8/postgres-tomcat/tomcat/setenv.sh | 2 +-
 9/mysql-tomcat/tomcat/setenv.sh    | 2 +-
 9/postgres-tomcat/tomcat/setenv.sh | 2 +-
 template/tomcat/setenv.sh          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/8/mysql-tomcat/tomcat/setenv.sh b/8/mysql-tomcat/tomcat/setenv.sh
index 9e4977b..12f1781 100755
--- a/8/mysql-tomcat/tomcat/setenv.sh
+++ b/8/mysql-tomcat/tomcat/setenv.sh
@@ -1 +1 @@
-export CATALINA_OPTS="-Xmx1024m"
+export CATALINA_OPTS="-Xmx1024m -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true"
diff --git a/8/postgres-tomcat/tomcat/setenv.sh b/8/postgres-tomcat/tomcat/setenv.sh
index 9e4977b..12f1781 100755
--- a/8/postgres-tomcat/tomcat/setenv.sh
+++ b/8/postgres-tomcat/tomcat/setenv.sh
@@ -1 +1 @@
-export CATALINA_OPTS="-Xmx1024m"
+export CATALINA_OPTS="-Xmx1024m -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true"
diff --git a/9/mysql-tomcat/tomcat/setenv.sh b/9/mysql-tomcat/tomcat/setenv.sh
index 9e4977b..12f1781 100755
--- a/9/mysql-tomcat/tomcat/setenv.sh
+++ b/9/mysql-tomcat/tomcat/setenv.sh
@@ -1 +1 @@
-export CATALINA_OPTS="-Xmx1024m"
+export CATALINA_OPTS="-Xmx1024m -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true"
diff --git a/9/postgres-tomcat/tomcat/setenv.sh b/9/postgres-tomcat/tomcat/setenv.sh
index 9e4977b..12f1781 100755
--- a/9/postgres-tomcat/tomcat/setenv.sh
+++ b/9/postgres-tomcat/tomcat/setenv.sh
@@ -1 +1 @@
-export CATALINA_OPTS="-Xmx1024m"
+export CATALINA_OPTS="-Xmx1024m -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true"
diff --git a/template/tomcat/setenv.sh b/template/tomcat/setenv.sh
index 9e4977b..12f1781 100755
--- a/template/tomcat/setenv.sh
+++ b/template/tomcat/setenv.sh
@@ -1 +1 @@
-export CATALINA_OPTS="-Xmx1024m"
+export CATALINA_OPTS="-Xmx1024m -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true -Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true"
-- 
GitLab