From cc384d767e40caa84c58b259853d9cbaaaab33fe Mon Sep 17 00:00:00 2001
From: Gary Kim <gary@garykim.dev>
Date: Sat, 20 Jul 2019 18:44:53 +0000
Subject: [PATCH] Specify using AllowEncodedSlashes and nocanon for httpd
 (#7540)

When using wiki page names that include a slash
behind a Apache HTTPD reverse proxy,
AllowEncodedSlashes NoDecode
and appending nocanon to the ProxyPass
directive is required. This commit adds that
information to the documentation.

Signed-off-by: Gary Kim <gary@garykim.dev>
---
 docs/content/doc/usage/reverse-proxies.en-us.md | 6 ++++--
 docs/content/doc/usage/reverse-proxies.zh-cn.md | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/content/doc/usage/reverse-proxies.en-us.md b/docs/content/doc/usage/reverse-proxies.en-us.md
index d828d5b226..24fb16e364 100644
--- a/docs/content/doc/usage/reverse-proxies.en-us.md
+++ b/docs/content/doc/usage/reverse-proxies.en-us.md
@@ -53,7 +53,8 @@ If you want Apache HTTPD to serve your Gitea instance, you can add the following
     ...
     ProxyPreserveHost On
     ProxyRequests off
-    ProxyPass / http://localhost:3000/
+    AllowEncodedSlashes NoDecode
+    ProxyPass / http://localhost:3000/ nocanon
     ProxyPassReverse / http://localhost:3000/
 </VirtualHost>
 ```
@@ -70,9 +71,10 @@ In case you already have a site, and you want Gitea to share the domain name, yo
     <Proxy *>
          Order allow,deny
          Allow from all
+         AllowEncodedSlashes NoDecode
     </Proxy>
 
-    ProxyPass /git http://localhost:3000 # Note: no trailing slash after either /git or port
+    ProxyPass /git http://localhost:3000 nocanon # Note: no trailing slash after either /git or port
     ProxyPassReverse /git http://localhost:3000 # Note: no trailing slash after either /git or port
 </VirtualHost>
 ```
diff --git a/docs/content/doc/usage/reverse-proxies.zh-cn.md b/docs/content/doc/usage/reverse-proxies.zh-cn.md
index c3f5758c16..189a18281c 100644
--- a/docs/content/doc/usage/reverse-proxies.zh-cn.md
+++ b/docs/content/doc/usage/reverse-proxies.zh-cn.md
@@ -54,7 +54,8 @@ server {
     ...
     ProxyPreserveHost On
     ProxyRequests off
-    ProxyPass / http://localhost:3000/
+    AllowEncodedSlashes NoDecode
+    ProxyPass / http://localhost:3000/ nocanon
     ProxyPassReverse / http://localhost:3000/
 </VirtualHost>
 ```
@@ -71,9 +72,10 @@ server {
     <Proxy *>
          Order allow,deny
          Allow from all
+         AllowEncodedSlashes NoDecode
     </Proxy>
 
-    ProxyPass /git http://localhost:3000 # Note: no trailing slash after either /git or port
+    ProxyPass /git http://localhost:3000 nocanon # Note: no trailing slash after either /git or port
     ProxyPassReverse /git http://localhost:3000 # Note: no trailing slash after either /git or port
 </VirtualHost>
 ```