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

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 7ce4ddfa1f6b45ca509bbc6c0cd4cc2a6cbee7b8..34361efc6df4e1ef6c3c3dc6760d3848ad1066cb 100644 (file)
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -202,6 +202,7 @@ web.mountParameters = true
 #\r
 # <https://issues.apache.org/jira/browse/WICKET-1303>\r
 # <http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10>\r
+# Add *org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true* to *CATALINA_OPTS*\r
 #\r
 # SINCE 0.5.2\r
 web.forwardSlashCharacter = /\r

diff --git a/docs/03_faq.mkd b/docs/03_faq.mkd
index 3e99fb7a78d622ed691cb4f8e592d1665007045d..478e199205bd2c2b2066aa9c14bf492ff545bae3 100644 (file)
--- 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.  \r
 You have a few options on how to handle this scenario:\r
 \r
-1. [Tweak Tomcat](http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10) \r
+1. [Tweak Tomcat](http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10)  \r
+Add *org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true* to *CATALINA_OPTS*\r
 2. *web.mountParameters = false* and use non-pretty, parameterized urls\r
 3. *web.forwardSlashCharacter = !* which tells Gitblit to use **!** instead of **/**\r
 \r