From: James Moger <james.moger@gitblit.com>
Date: Wed, 30 Nov 2011 22:21:30 +0000 (-0500)
Subject: Clarified Tomcat forward-slash encoding in documentation (issue 29)
X-Git-Tag: v0.8.0~86
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=efba97d1d2568d4a71c39ec049cb1a5015855f75;p=gitblit.git

Clarified Tomcat forward-slash encoding in documentation (issue 29)
---

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 7ce4ddfa..34361efc 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -202,6 +202,7 @@ web.mountParameters = true
 #
 # <https://issues.apache.org/jira/browse/WICKET-1303>
 # <http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10>
+# Add *org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true* to *CATALINA_OPTS*
 #
 # SINCE 0.5.2
 web.forwardSlashCharacter = /
diff --git a/docs/03_faq.mkd b/docs/03_faq.mkd
index 3e99fb7a..478e1992 100644
--- a/docs/03_faq.mkd
+++ b/docs/03_faq.mkd
@@ -66,7 +66,8 @@ If you are using Apache mod_proxy, specify [AllowEncodedSlashes NoDecode](http:/
 Tomcat takes the extra precaution of [disallowing embedded slashes by default](http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10).  This breaks Gitblit urls.  
 You have a few options on how to handle this scenario:
 
-1. [Tweak Tomcat](http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10) 
+1. [Tweak Tomcat](http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10)  
+Add *org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true* to *CATALINA_OPTS*
 2. *web.mountParameters = false* and use non-pretty, parameterized urls
 3. *web.forwardSlashCharacter = !* which tells Gitblit to use **!** instead of **/**