diff --git a/AUTHORS b/AUTHORS
index d1e91acc5cc86439b887438cf0e8d8080259dbaa..26cd4241027245ddd72d9848f89b0e7d4f24a6e9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ Jan Garaj <info@monitoringartist.com>
Jiten Bhagat <jits@users.noreply.github.com>
johanneslanger <jo.langer@gmail.com>
Naveen <nsrinivasan1976@gmail.com>
+PJ Eby <pje@telecommunity.com>
Remco Verhoef <remco@dutchcoders.io>
Rémi Vion <vion.remi@gmail.com>
Rohith <gambol99@gmail.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index adeaf1b3d19fd24600e8c1cbbaf61bc29d562663..af09ab43da57385037f618e3e62a775c4abbdae3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-#### **2.1.0/master (unrealised/unstable)**
+#### **2.1.0**
FIXES:
* fixed the parsing of slices for command line arguments (i.e. --cors-origins etc)
@@ -11,6 +11,7 @@ FIXES:
* added docker image instructions to the readme [#PR204](https://github.com/gambol99/keycloak-proxy/pull/204)
* added unit tests for the debug handlers [#PR223](https://github.com/gambol99/keycloak-proxy/pull/223)
* fixing the logout handler panic when revocation url is not set [#PR254](https://github.com/gambol99/keycloak-proxy/pull/254)
+* fixing the Host header on the forwarding proxy [#PR290](https://github.com/gambol99/keycloak-proxy/pull/290)
FEATURES
* changed the routing engine from gin to echo
diff --git a/README.md b/README.md
index ad1624ba16c342789615b1e504e23cab304aba7a..14ccae0090ccfbcc20a815be8aa2897b5338ed44 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ USAGE:
keycloak-proxy [options]
VERSION:
- v2.1.0-rc4 (git+sha: 8c31d10-dirty, built: 06-09-2017)
+ v2.1.0 (git+sha: 87f0b9c-dirty, built: 21-12-2017)
AUTHOR:
Rohith <gambol99@gmail.com>
@@ -58,7 +58,6 @@ GLOBAL OPTIONS:
--upstream-ca value the path to a file container a CA certificate to validate the upstream tls endpoint
--resources value list of resources 'uri=/admin|methods=GET,PUT|roles=role1,role2'
--headers value custom headers to the upstream request, key=value
- --enable-token-header enables the token authentication header X-Auth-Token to upstream (default: true)
--enable-encrypted-token enable encryption for the access tokens (default: false)
--enable-logging enable http logging of the requests (default: false)
--enable-json-logging switch on json logging rather than text (default: false)
@@ -66,7 +65,9 @@ GLOBAL OPTIONS:
--enable-security-filter enables the security filter handler (default: false) [$PROXY_ENABLE_SECURITY_FILTER]
--enable-refresh-tokens enables the handling of the refresh tokens (default: false) [$PROXY_ENABLE_REFRESH_TOKEN]
--enable-login-handler enables the handling of the refresh tokens (default: false) [$PROXY_ENABLE_LOGIN_HANDLER]
- --enable-authorization-header adds the authorization header to the proxy request (default: true)
+ --enable-token-header enables the token authentication header X-Auth-Token to upstream (default: true)
+ --enable-authorization-header adds the authorization header to the proxy request (default: true) [$PROXY_ENABLE_AUTHORIZATION_HEADER]
+ --enable-authorization-cookies adds the authorization cookies to the uptream proxy request (default: true) [$PROXY_ENABLE_AUTHORIZATION_COOKIES]
--enable-https-redirection enable the http to https redirection on the http service (default: false)
--enable-profiling switching on the golang profiling via pprof on /debug/pprof, /debug/pprof/heap etc (default: false)
--enable-metrics enable the prometheus metrics collector on /oauth/metrics (default: false)
@@ -539,13 +540,13 @@ Assuming the *--enable-metrics* has been set, a Prometheus endpoint can be found
Keep in mind [browser cookie limits](http://browsercookielimits.squawky.net/), if you use access or
refresh tokens in the browser cookie. Keycloak-proxy divides cookie automatically if your cookie
-is longer than 4093 bytes. Real size of the cookie depends on the content of the issued access token.
+is longer than 4093 bytes. Real size of the cookie depends on the content of the issued access token.
Also, encryption might add additional bytes to the cookie size. If you have large cookies (>200 KB),
-you might reach browser cookie limits.
+you might reach browser cookie limits.
-All cookies are part of the header request, so you might find a problem with the max headers size
-limits in your infrastructure (some load balancers have very low this value, such as 8 KB). Be
-sure that all network devices have sufficient header size limits. Otherwise, your users won't be
+All cookies are part of the header request, so you might find a problem with the max headers size
+limits in your infrastructure (some load balancers have very low this value, such as 8 KB). Be
+sure that all network devices have sufficient header size limits. Otherwise, your users won't be
able to obtain access token.
### **Contribution Guidelines**
diff --git a/doc.go b/doc.go
index b2e0696dab00c5dc1de96fb466f293d36a805665..9fd06fac7576b4e226966d4740b1eb23328cddda 100644
--- a/doc.go
+++ b/doc.go
@@ -26,7 +26,7 @@ import (
)
var (
- release = "v2.1.0-rc5"
+ release = "v2.1.0"
gitsha = "no gitsha provided"
compiled = "0"
version = ""