Merge branch 'develop' into feature/contribution-guide-fix

shawncatz · web-flow · commit 612a8a00ab95 · 2017-03-19T11:56:54.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ go:
   - 1.4
   - 1.5
   - 1.6
+  - 1.7
+  - 1.8
   - tip
 
 os:
@@ -24,9 +26,13 @@ services:
 
 before_install:
   # TRAVIS_OS_NAME - linux and osx
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install memcached redis; fi'
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nohup /usr/local/opt/memcached/bin/memcached & fi'
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nohup redis-server /usr/local/etc/redis.conf & fi'
+  - echo $TRAVIS_OS_NAME
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      brew update && brew install memcached redis && brew services start redis && brew services start memcached
+    fi
+  - redis-server --daemonize yes
+  - redis-cli info
 
 install:
   # Setting environments variables
diff --git a/filterconfig.go b/filterconfig.go
@@ -66,7 +66,7 @@ func newFilterConfigurator(controllerName, methodName string) FilterConfigurator
 
 // FilterController returns a configurator for the filters applied to all
 // actions on the given controller instance.  For example:
-//   FilterAction(MyController{})
+//   FilterController(MyController{})
 func FilterController(controllerInstance interface{}) FilterConfigurator {
 	t := reflect.TypeOf(controllerInstance)
 	for t.Kind() == reflect.Ptr {
diff --git a/revel.go b/revel.go
@@ -204,7 +204,7 @@ func Init(mode, importPath, srcPath string) {
 	AppRoot = Config.StringDefault("app.root", "")
 	CookiePrefix = Config.StringDefault("cookie.prefix", "REVEL")
 	CookieDomain = Config.StringDefault("cookie.domain", "")
-	CookieSecure = Config.BoolDefault("cookie.secure", !DevMode)
+	CookieSecure = Config.BoolDefault("cookie.secure", HTTPSsl)
 	TemplateDelims = Config.StringDefault("template.delimiters", "")
 	if secretStr := Config.StringDefault("app.secret", ""); secretStr != "" {
 		secretKey = []byte(secretStr)
diff --git a/testing/testsuite_test.go b/testing/testsuite_test.go
@@ -76,7 +76,7 @@ func TestGetCustom(t *testing.T) {
 
 	testSuite.AssertOk()
 	testSuite.AssertContentType("application/json")
-	testSuite.AssertHeader("Server", "nginx")
+	testSuite.AssertHeader("Server", "gunicorn/19.7.0")
 	testSuite.AssertContains("httpbin.org")
 	testSuite.AssertContainsRegex("gzip|deflate")
 }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func TestGetCustom(t *testing.T) {`
`76`	`76`
`77`	`77`	`testSuite.AssertOk()`
`78`	`78`	`testSuite.AssertContentType("application/json")`
`79`		`- testSuite.AssertHeader("Server", "nginx")`
	`79`	`+ testSuite.AssertHeader("Server", "gunicorn/19.7.0")`
`80`	`80`	`testSuite.AssertContains("httpbin.org")`
`81`	`81`	`testSuite.AssertContainsRegex("gzip\|deflate")`
`82`	`82`	`}`