serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-05 18:44:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved fastcgi middleware into its own package

Browse source
This commit is contained in:
Matthew Holt 2015-01-29 22:03:14 -07:00
parent 89783ac0c2
commit affd470820
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
middleware/fastcgi.go → middleware/fastcgi/fastcgi.go
View file

@ -1,4 +1,8 @@
package middleware // FastCGI is middleware that acts as a FastCGI client. Requests
// that get forwarded to FastCGI stop the middleware execution
// chain. The most common use for this layer is to serve PHP
// websites with php-fpm.
package fastcgi
import ( import (
"io" "io"
@ -8,21 +12,20 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/mholt/caddy/middleware"
"bitbucket.org/PinIdea/fcgi_client" // TODO: Inline this dependency. It'll need some work. "bitbucket.org/PinIdea/fcgi_client" // TODO: Inline this dependency. It'll need some work.
) )
// FastCGI is middleware that acts as a FastCGI client. Requests // New generates a new FastCGI middleware.
// that get forwarded to FastCGI stop the middleware execution func New(c middleware.Controller) (middleware.Middleware, error) {
// chain. The most common use for this layer is to serve PHP root := c.Root()
// websites with php-fpm.
func FastCGI(p parser) Middleware {
root := p.Root()
var rules []fastCgi var rules []fastCgi
for p.Next() { for c.Next() {
rule := fastCgi{} rule := fastCgi{}
if !p.Args(&rule.path, &rule.address) { if !c.Args(&rule.path, &rule.address) {
return p.ArgErr() return nil, c.ArgErr()
} }
rules = append(rules, rule) rules = append(rules, rule)
} }
@ -32,7 +35,7 @@ func FastCGI(p parser) Middleware {
servedFcgi := false servedFcgi := false
for _, rule := range rules { for _, rule := range rules {
if Path(r.URL.Path).Matches(rule.path) { if middleware.Path(r.URL.Path).Matches(rule.path) {
servedFcgi = true servedFcgi = true
// Get absolute file paths // Get absolute file paths
@ -102,7 +105,7 @@ func FastCGI(p parser) Middleware {
next(w, r) next(w, r)
} }
} }
} }, nil
} }
type fastCgi struct { type fastCgi struct {