#80 add context_legacy.go and context.go for go 1.7 migration

README.md

@@ -74,6 +74,20 @@ Other implementations of the `sessions.Store` interface:
 * [github.com/michaeljs1990/sqlitestore](https://github.com/michaeljs1990/sqlitestore) - SQLite
 * [github.com/wader/gormstore](https://github.com/wader/gormstore) - GORM (MySQL, PostgreSQL, SQLite)
 
+## Notes
+Note about `GetRegistry` changes: As of Go version 1.7, gorilla/sessions uses the Go standard library's `context` package rather than `gorilla/context`. This required changing `GetRegistry` to return a shallow copy of the http Request. Users of the `sessions.GetRegistry` method who are upgrading to Go 1.7 will need to change calls to `sessions.GetRegistry`. For example, this (Go 1.6 and prior):
+
+```
+reg := sessions.GetRegistry(req)
+```
+
+will need to change to this:
+
+```
+var reg *Registry
+reg, req = sessions.GetRegistry(req)
+```
+
 ## License
 
 BSD licensed. See the LICENSE file for details.

context.go

@@ -0,0 +1,22 @@
+// +build go1.7
+
+package sessions
+
+import (
+	"context"
+	"net/http"
+)
+
+func contextGet(r *http.Request, key contextKey) interface{} {
+	return r.Context().Value(key)
+}
+
+func contextSave(r *http.Request, key contextKey, val interface{}) *http.Request {
+	ctx := r.Context()
+	ctx = context.WithValue(ctx, key, val)
+	return r.WithContext(ctx)
+}
+
+func contextClear(r *http.Request) {
+	// no-op for go1.7+
+}

context_legacy.go

@@ -0,0 +1,22 @@
+// +build !go1.7
+
+package sessions
+
+import (
+	"net/http"
+
+	"github.com/gorilla/context"
+)
+
+func contextGet(r *http.Request, key contextKey) interface{} {
+	return context.Get(r, key)
+}
+
+func contextSave(r *http.Request, key contextKey, val interface{}) *http.Request {
+	context.Set(r, key, val)
+	return r
+}
+
+func contextClear(r *http.Request) {
+	context.Clear(r)
+}

sessions.go

@@ -9,8 +9,6 @@ import (
 	"fmt"
 	"net/http"
 	"time"
-
-	"github.com/gorilla/context"
 )
 
 // Default flashes key.
@@ -122,17 +120,17 @@ type contextKey int
 const registryKey contextKey = 0
 
 // GetRegistry returns a registry instance for the current request.
-func GetRegistry(r *http.Request) *Registry {
-	registry := context.Get(r, registryKey)
+func GetRegistry(r *http.Request) (*Registry, *http.Request) {
+	registry := contextGet(r, registryKey)
 	if registry != nil {
-		return registry.(*Registry)
+		return registry.(*Registry), r
 	}
 	newRegistry := &Registry{
 		request:  r,
 		sessions: make(map[string]sessionInfo),
 	}
-	context.Set(r, registryKey, newRegistry)
-	return newRegistry
+	r = contextSave(r, registryKey, newRegistry)
+	return newRegistry, r
 }
 
 // Registry stores sessions used during a request.
@@ -186,7 +184,9 @@ func init() {
 
 // Save saves all sessions used during the current request.
 func Save(r *http.Request, w http.ResponseWriter) error {
-	return GetRegistry(r).Save(w)
+	var reg *Registry
+	reg, r = GetRegistry(r)
+	return reg.Save(w)
 }
 
 // NewCookie returns an http.Cookie with the options set. It also sets

store.go

@@ -77,7 +77,9 @@ type CookieStore struct {
 // It returns a new session and an error if the session exists but could
 // not be decoded.
 func (s *CookieStore) Get(r *http.Request, name string) (*Session, error) {
-	return GetRegistry(r).Get(s, name)
+	reg, req := GetRegistry(r)
+	*r = *req
+	return reg.Get(s, name)
 }
 
 // New returns a session for the given name without adding it to the registry.
@@ -180,7 +182,9 @@ func (s *FilesystemStore) MaxLength(l int) {
 //
 // See CookieStore.Get().
 func (s *FilesystemStore) Get(r *http.Request, name string) (*Session, error) {
-	return GetRegistry(r).Get(s, name)
+	reg, req := GetRegistry(r)
+	*r = *req
+	return reg.Get(s, name)
 }
 
 // New returns a session for the given name without adding it to the registry.