Merge pull request revel#843 from revel/feature/sane-http-timeout-defaults

brendensoares · brendensoares · commit db9c80ff9ce0 · 2015-01-06T23:05:02.000-08:00
Feature/sane http timeout defaults
diff --git a/flash.go b/flash.go
@@ -12,6 +12,7 @@ import (
 // E.g. the Post/Redirect/Get pattern:
 // http://en.wikipedia.org/wiki/Post/Redirect/Get
 type Flash struct {
+	// `Data` is the input which is read in `restoreFlash`, `Out` is the output which is set in a FLASH cookie at the end of the `FlashFilter()`
 	Data, Out map[string]string
 }
 
diff --git a/server.go b/server.go
@@ -94,8 +94,10 @@ func Run(port int) {
 	}
 
 	Server = &http.Server{
-		Addr:    localAddress,
-		Handler: http.HandlerFunc(handle),
+		Addr:         localAddress,
+		Handler:      http.HandlerFunc(handle),
+		ReadTimeout:  time.Minute,
+		WriteTimeout: time.Minute,
 	}
 
 	runStartupHooks()

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`	`// E.g. the Post/Redirect/Get pattern:`
`13`	`13`	`// http://en.wikipedia.org/wiki/Post/Redirect/Get`
`14`	`14`	`type Flash struct {`
	`15`	+ // `Data` is the input which is read in `restoreFlash`, `Out` is the output which is set in a FLASH cookie at the end of the `FlashFilter()`
`15`	`16`	`Data, Out map[string]string`
`16`	`17`	`}`
`17`	`18`
Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,10 @@ func Run(port int) {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`Server = &http.Server{`
`97`		`- Addr: localAddress,`
`98`		`- Handler: http.HandlerFunc(handle),`
	`97`	`+ Addr: localAddress,`
	`98`	`+ Handler: http.HandlerFunc(handle),`
	`99`	`+ ReadTimeout: time.Minute,`
	`100`	`+ WriteTimeout: time.Minute,`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`runStartupHooks()`