summaryrefslogtreecommitdiffstats
path: root/gerrit-httpd
diff options
context:
space:
mode:
authorShawn Pearce <sop@google.com>2013-04-17 07:18:09 -0700
committerShawn Pearce <sop@google.com>2013-04-17 07:18:09 -0700
commit768cff15b09b724cd930f904eaac867443fb966d (patch)
tree14e31883d495c4c8e20eac0f27a95b96dd36d2f0 /gerrit-httpd
parent27a3917dcbf851b62433a0f2360f9ac64db7938d (diff)
Update proxy example shown on container configuration error page
Apache needs to use mod_rewrite to handle Gerrit's URL encoded REST API URLs. Change-Id: I02bfa48a0294072b83be950c0c2efbe0e0c8905c
Diffstat (limited to 'gerrit-httpd')
-rw-r--r--gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html14
1 files changed, 4 insertions, 10 deletions
diff --git a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html
index 729401205c..a7cd489147 100644
--- a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html
+++ b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html
@@ -49,22 +49,16 @@
&lt;VirtualHost <span class='ServerName'>review.example.com</span><span class='ServerPort'>:80</span>&gt;
ServerName <span class='ServerName'>review.example.com</span>
- ProxyRequests Off
- ProxyVia Off
- ProxyPreserveHost On
-
- &lt;Proxy *&gt;
- Order deny,allow
- Allow from all
- &lt;/Proxy&gt;
-
<div class='apache_auth'> &lt;Location <span class='ContextPath'>/r</span>/login/&gt;
AuthType Basic
AuthName "Gerrit Code Review"
Require valid-user
...
&lt;/Location&gt;</div>
- ProxyPass <span class='ContextPath'>/r</span>/ http://...<span class='ContextPath'>/r</span>/
+
+ AllowEncodedSlashes NoDecode
+ RewriteEngine On
+ RewriteRule ^<span class='ContextPath'>/r</span>/(.*) http://...<span class='ContextPath'>/r</span>/$1
&lt;/VirtualHost&gt;
</pre>
</body>