diff options
| author | Shawn Pearce <sop@google.com> | 2013-04-18 17:17:19 -0700 |
|---|---|---|
| committer | Shawn Pearce <sop@google.com> | 2013-04-18 17:17:19 -0700 |
| commit | 9fdaa99090bf4ceb2ccb7d81c2ca9615fa973de6 (patch) | |
| tree | 07c80f7ae60f014d29ac03221e4f65bf43adabe9 /gerrit-httpd | |
| parent | b0debe1223f11db8741ff6df420e94c6334906b0 (diff) | |
| parent | a2b19e1233afa1ddc8919e50951f188d21d95db3 (diff) | |
Merge branch 'stable-2.6'
* stable-2.6:
Include [NE,P] on rewrite rules for Apache proxy
TrivialRebase: Exclude Code-Review-2
TrivialRebase: Aggregate approvals
Diffstat (limited to 'gerrit-httpd')
| -rw-r--r-- | gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html | 2 |
1 files changed, 1 insertions, 1 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 a7cd489147..0bc3369211 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 @@ -58,7 +58,7 @@ AllowEncodedSlashes NoDecode RewriteEngine On - RewriteRule ^<span class='ContextPath'>/r</span>/(.*) http://...<span class='ContextPath'>/r</span>/$1 + RewriteRule ^<span class='ContextPath'>/r</span>/(.*) http://...<span class='ContextPath'>/r</span>/$1 [NE,P] </VirtualHost> </pre> </body> |