Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support context #221

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server.go
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ func (s *Server) ttyColor(msg string, colorCode string) string {
// with the returned route.
func (s *Server) routeHandler(req *http.Request, w http.ResponseWriter) (unused *route) {
requestPath := req.URL.Path
ctx := Context{req, map[string]string{}, s, w}
ctx := Context{req.Context(), req, map[string]string{}, s, w}

//set some default headers
ctx.SetHeader("Server", "web.go", true)
Expand Down
2 changes: 2 additions & 0 deletions web.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package web

import (
"context"
"crypto/tls"
"golang.org/x/net/websocket"
"log"
Expand All @@ -19,6 +20,7 @@ import (
// about the request, including the http.Request object, the GET and POST params,
// and acts as a Writer for the response.
type Context struct {
context.Context
Request *http.Request
Params map[string]string
Server *Server
Expand Down