Merge remote-tracking branch 'upstream/master'

.travis.yml

+language: go
+script: go test ./...
\ No newline at end of file

config/setup/controller_test.go

@@ -10,7 +10,7 @@ import (
 // newTestController creates a new *Controller for
 // the input specified, with a filename of "Testfile"
 func newTestController(input string) *Controller {
-	return Controller{
+	return &Controller{
 		Config:    &server.Config{},
 		Dispenser: parse.NewDispenser("Testfile", strings.NewReader(input)),
 	}

main.go

@@ -27,7 +27,7 @@ var (
 )
 
 func init() {
-	flag.StringVar(&conf, "conf", "", "Configuration file to use")
+	flag.StringVar(&conf, "conf", "", "Configuration file to use (default="+config.DefaultConfigFile+")")
 	flag.BoolVar(&http2, "http2", true, "Enable HTTP/2 support") // TODO: temporary flag until http2 merged into std lib
 	flag.BoolVar(&quiet, "quiet", false, "Quiet mode (no initialization output)")
 	flag.StringVar(&cpu, "cpu", "100%", "CPU cap")

middleware/fastcgi/fcgiclient_test.go

+// NOTE: These tests were adapted from the original
+// repository from which this package was forked.
+// The tests are slow (~10s) and in dire need of rewriting.
+// As such, the tests have been disabled to speed up
+// automated builds until they can be properly written.
+
 package fastcgi
 
 import (
@@ -185,7 +191,7 @@ func generateRandFile(size int) (p string, m string) {
 	return
 }
 
-func Test(t *testing.T) {
+func Disabled_Test(t *testing.T) {
 	// TODO: test chunked reader
 
 	t_ = t