diff options
| author | Shawn Pearce <sop@google.com> | 2013-06-07 16:32:21 -0700 |
|---|---|---|
| committer | Shawn Pearce <sop@google.com> | 2013-06-08 18:52:32 -0700 |
| commit | f81f5142eb7b1b8c62bd95ca72b8bf3f76d5dc8d (patch) | |
| tree | 01917e64339c1383823c24cfb2bc1a6ae1afb5b2 /gerrit-httpd | |
| parent | cbea27a46602a9a47bce98c53078730da3cbad19 (diff) | |
| parent | 65f112881996356dcf34e36cf497e33f20df93d5 (diff) | |
Merge branch 'stable-2.6' into stable-2.7
* stable-2.6:
Check that patch set is current before doing a rebase
Add trailing period on "This reverts commit ..." line
Documentation: Reverse Proxy Configuration
Fix: push bypass review cannot close change from UI
Fix: 'change_key' of current patchset pushed by 'refs/changes' is still old one.
Update the release notes for 2.6
Conflicts:
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
Change-Id: Ie26334c433bc23c8ec47440bbd14c54e6ca8a782
Diffstat (limited to 'gerrit-httpd')
| -rw-r--r-- | gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/ConfigurationError.html | 14 |
1 files changed, 11 insertions, 3 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 0bc3369211..a05e1ea90e 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,6 +49,15 @@ <VirtualHost <span class='ServerName'>review.example.com</span><span class='ServerPort'>:80</span>> ServerName <span class='ServerName'>review.example.com</span> + ProxyRequests Off + ProxyVia Off + ProxyPreserveHost On + + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + <div class='apache_auth'> <Location <span class='ContextPath'>/r</span>/login/> AuthType Basic AuthName "Gerrit Code Review" @@ -56,9 +65,8 @@ ... </Location></div> - AllowEncodedSlashes NoDecode - RewriteEngine On - RewriteRule ^<span class='ContextPath'>/r</span>/(.*) http://...<span class='ContextPath'>/r</span>/$1 [NE,P] + AllowEncodedSlashes On + ProxyPass <span class='ContextPath'>/r</span>/ http://...<span class='ContextPath'>/r</span>/ nodecode </VirtualHost> </pre> </body> |