update the vendor json library which is used when 'WithOptimizations' passed on 'app.Run' and resolve https://github.com/kataras/iris/pull/839#issuecomment-351374343

Former-commit-id: ad3354717d593393a3f3aec863ec92f1f7e1c829
This commit is contained in:
Gerasimos (Makis) Maropoulos 2017-12-13 14:37:02 +02:00
parent 20f68416a7
commit ea863914dc
8 changed files with 18 additions and 5 deletions

2
Gopkg.lock generated
View File

@ -119,7 +119,7 @@
branch = "master"
name = "github.com/json-iterator/go"
packages = ["."]
revision = "2dc0031b26575ddf5dab09ab7795105a05575473"
revision = "13f86432b882000a51c6e610c620974462691a97"
[[projects]]
branch = "master"

0
_examples/README.md Executable file → Normal file
View File

View File

@ -32,7 +32,7 @@ func init() {
filename := homeConfigurationFilename(".yml")
c, err := parseYAML(filename)
if err != nil {
// this error will be occured the first time that the configuration
// this error will be occurred the first time that the configuration
// file doesn't exist.
// Create the YAML-ONLY global configuration file now using the default configuration 'c'.
// This is useful when we run multiple iris servers that share the same

View File

@ -2523,7 +2523,7 @@ func (ctx *context) RemoveCookie(name string) {
c.Expires = exp
c.MaxAge = -1
ctx.SetCookie(c)
// delete request's cookie also, which is temporary available
// delete request's cookie also, which is temporary available.
ctx.request.Header.Set("Cookie", "")
}

0
middleware/README.md Executable file → Normal file
View File

View File

@ -56,6 +56,13 @@ type (
// Defaults to false.
CookieSecureTLS bool
// AllowReclaim will allow to
// Destroy and Start a session in the same request handler.
// All it does is that it removes the cookie for both `Request` and `ResponseWriter`.
//
// Defaults to false.
AllowReclaim bool
// Encode the cookie value if not nil.
// Should accept as first argument the cookie name (config.Cookie)
// as second argument the server's generated session id.

View File

@ -38,7 +38,8 @@ func AddCookie(ctx context.Context, cookie *http.Cookie) {
}
// RemoveCookie deletes a cookie by it's name/key
func RemoveCookie(ctx context.Context, name string) {
// If "purge" is true then it removes the, temp, cookie from the request as well.
func RemoveCookie(ctx context.Context, name string, purge bool) {
c, err := ctx.Request().Cookie(name)
if err != nil {
return
@ -50,6 +51,11 @@ func RemoveCookie(ctx context.Context, name string) {
c.Value = ""
c.Path = "/"
AddCookie(ctx, c)
if purge {
// delete request's cookie also, which is temporary available.
ctx.Request().Header.Set("Cookie", "")
}
}
// IsValidCookieDomain returns true if the receiver is a valid domain to set

View File

@ -146,7 +146,7 @@ func (s *Sessions) Destroy(ctx context.Context) {
if cookieValue == "" { // nothing to destroy
return
}
RemoveCookie(ctx, s.config.Cookie)
RemoveCookie(ctx, s.config.Cookie, s.config.AllowReclaim)
s.provider.Destroy(cookieValue)
}