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

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 (
"io"
@ -8,21 +12,20 @@ import (
"path/filepath"
"strings"
"github.com/mholt/caddy/middleware"
"bitbucket.org/PinIdea/fcgi_client" // TODO: Inline this dependency. It'll need some work.
)
// 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.
func FastCGI(p parser) Middleware {
root := p.Root()
// New generates a new FastCGI middleware.
func New(c middleware.Controller) (middleware.Middleware, error) {
root := c.Root()
var rules []fastCgi
for p.Next() {
for c.Next() {
rule := fastCgi{}
if !p.Args(&rule.path, &rule.address) {
return p.ArgErr()
if !c.Args(&rule.path, &rule.address) {
return nil, c.ArgErr()
}
rules = append(rules, rule)
}
@ -32,7 +35,7 @@ func FastCGI(p parser) Middleware {
servedFcgi := false
for _, rule := range rules {
if Path(r.URL.Path).Matches(rule.path) {
if middleware.Path(r.URL.Path).Matches(rule.path) {
servedFcgi = true
// Get absolute file paths
@ -102,7 +105,7 @@ func FastCGI(p parser) Middleware {
next(w, r)
}
}
}
}, nil
}
type fastCgi struct {