Revert "Merge branch 'fcgi-handler' of https://github.com/Gufran/fabio"

This reverts commit 0daf269, reversing changes made to 8489b4e.
fabiolb · Aug 16, 2018 · 484b9dc · 484b9dc
1 parent f7b337d
commit 484b9dc
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 1,266 deletions.
diff --git a/NOTICES.txt b/NOTICES.txt
@@ -157,8 +157,3 @@ golang.org/x/sync/singleflight
 https://golang.org/x/sync/singleflight
 License: BSD 3-clause (https://golang.org/x/sync/LICENSE)
 Copyright (c) 2009 The Go Authors. All rights reserved.
-
-github.com/mholt/caddy
-https://github.com/mholt/caddy
-License: Apache 2.0 (https://github.com/mholt/caddy/LICENSE.txt)
-Copyright (c) 2015, Light Code Labs, LLC
diff --git a/config/config.go b/config/config.go
@@ -14,7 +14,6 @@ type Config struct {
 	Metrics     Metrics
 	UI          UI
 	Runtime     Runtime
-	FastCGI     FastCGI
 	ProfileMode string
 	ProfilePath string
 	Insecure    bool
@@ -145,11 +144,3 @@ type Consul struct {
 	CheckDeregisterCriticalServiceAfter string
 	ChecksRequired                      string
 }
-
-type FastCGI struct {
-	Index        string
-	Root         string
-	SplitPath    string
-	ReadTimeout  time.Duration
-	WriteTimeout time.Duration
-}
diff --git a/config/default.go b/config/default.go
@@ -77,11 +77,4 @@ var defaultConfig = &Config{
 		Color:  "light-green",
 		Access: "rw",
 	},
-	FastCGI: FastCGI{
-		Root:         "",
-		Index:        "index.php",
-		SplitPath:    ".php",
-		ReadTimeout:  10 * time.Second,
-		WriteTimeout: 10 * time.Second,
-	},
 }
diff --git a/config/load.go b/config/load.go
@@ -186,11 +186,6 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c
 	f.StringVar(&cfg.UI.Title, "ui.title", defaultConfig.UI.Title, "optional title for the UI")
 	f.StringVar(&cfg.ProfileMode, "profile.mode", defaultConfig.ProfileMode, "enable profiling mode, one of [cpu, mem, mutex, block]")
 	f.StringVar(&cfg.ProfilePath, "profile.path", defaultConfig.ProfilePath, "path to profile dump file")
-	f.StringVar(&cfg.FastCGI.Index, "fcgi.index", defaultConfig.FastCGI.Index, "FastCGI index file name")
-	f.StringVar(&cfg.FastCGI.Root, "fcgi.root", defaultConfig.FastCGI.Root, "Document root of FastCGI upstream")
-	f.StringVar(&cfg.FastCGI.SplitPath, "fcgi.path.split", defaultConfig.FastCGI.SplitPath, "String literal to split the document path")
-	f.DurationVar(&cfg.FastCGI.ReadTimeout, "fcgi.timeout.read", defaultConfig.FastCGI.ReadTimeout, "FastCGI request read timeout")
-	f.DurationVar(&cfg.FastCGI.WriteTimeout, "fcgi.timeout.write", defaultConfig.FastCGI.WriteTimeout, "FastCGI request write timeout")
 
 	// deprecated flags
 	var proxyLogRoutes string

diff --git a/docs/content/feature/fastcgi-upstream.md b/docs/content/feature/fastcgi-upstream.md
diff --git a/docs/content/quickstart/_index.md b/docs/content/quickstart/_index.md
@@ -46,10 +46,6 @@ and you need to add a separate `urlprefix-` tag for every `host/path` prefix the
 
 	# TCP examples
 	urlprefix-:3306 proto=tcp                          # route external port 3306
-
-    # Fast-CGI example
-    urlprefix-/blog proto=fcgi
-    urlprefix-/home proto=fcgi strip=/home
 	```
 
 5. Start fabio without a config file

diff --git a/docs/content/ref/fcgi.index.md b/docs/content/ref/fcgi.index.md
diff --git a/docs/content/ref/fcgi.path.split.md b/docs/content/ref/fcgi.path.split.md
diff --git a/docs/content/ref/fcgi.root.md b/docs/content/ref/fcgi.root.md
diff --git a/docs/content/ref/fcgi.timeout.read.md b/docs/content/ref/fcgi.timeout.read.md
diff --git a/docs/content/ref/fcgi.timeout.write.md b/docs/content/ref/fcgi.timeout.write.md
diff --git a/main.go b/main.go
@@ -179,7 +179,7 @@ func newHTTPProxy(cfg *config.Config) http.Handler {
 	}
 
 	return &proxy.HTTPProxy{
-		Config:            cfg,
+		Config:            cfg.Proxy,
 		Transport:         newTransport(nil),
 		InsecureTransport: newTransport(&tls.Config{InsecureSkipVerify: true}),
 		Lookup: func(r *http.Request) *route.Target {