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

A couple pesky env variables to deal with in websockets

Browse source
This commit is contained in:
Matthew Holt 2015-03-03 18:39:38 -07:00
parent 37f0a37ed2
commit 3858e31942
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
middleware/websockets/websocket.go
View file

@ -51,7 +51,7 @@ func (ws WebSocket) buildEnv(cmd *exec.Cmd) error {
`AUTH_TYPE=`, // Not used
`CONTENT_LENGTH=`, // Not used
`CONTENT_TYPE=`, // Not used
`GATEWAY_INTERFACE=` + gatewayInterface,
`GATEWAY_INTERFACE=` + GatewayInterface,
`PATH_INFO=`, // TODO
`PATH_TRANSLATED=`, // TODO
`QUERY_STRING=` + ws.URL.RawQuery,
@ -66,7 +66,7 @@ func (ws WebSocket) buildEnv(cmd *exec.Cmd) error {
`SERVER_NAME=` + serverHost,
`SERVER_PORT=` + serverPort,
`SERVER_PROTOCOL=` + ws.Proto,
`SERVER_SOFTWARE=` + serverSoftware,
`SERVER_SOFTWARE=` + ServerSoftware,
}
// Add each HTTP header to the environment as well
@ -80,11 +80,3 @@ func (ws WebSocket) buildEnv(cmd *exec.Cmd) error {
return nil
}
const (
// See CGI spec, 4.1.4
gatewayInterface = "caddy-CGI/1.1"
// See CGI spec, 4.1.17
serverSoftware = "caddy/0.1.0"
)

22
middleware/websockets/websockets.go
View file

@ -17,6 +17,7 @@ type (
// websocket middleware generally, like a list of all the
// websocket endpoints.
WebSockets struct {
// Sockets holds all the web socket endpoint configurations
Sockets []WSConfig
}
@ -47,11 +48,8 @@ func (ws WebSockets) ServeHTTP(w http.ResponseWriter, r *http.Request) {
func New(c middleware.Controller) (middleware.Middleware, error) {
var websocks []WSConfig
var path string
var command string
for c.Next() {
var val string
var val, path, command string
// Path or command; not sure which yet
if !c.NextArg() {
@ -94,9 +92,25 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
})
}
GatewayInterface = envGatewayInterface
ServerSoftware = envServerSoftware
return func(next http.HandlerFunc) http.HandlerFunc {
// We don't use next because websockets aren't HTTP,
// so we don't invoke other middleware after this.
return WebSockets{Sockets: websocks}.ServeHTTP
}, nil
}
var (
// See CGI spec, 4.1.4
GatewayInterface string
// See CGI spec, 4.1.17
ServerSoftware string
)
const (
envGatewayInterface = "caddy-CGI/1.1"
envServerSoftware = "caddy/0.1.0"
)