6703055925
RHEL requires the source code for dependencies to be included in the srpm. The spec file already expects that, but we've only included the vendored modules (i.e., the `vendor` directory) in the `rhel-8.2.` branch. Move vendoring to master, so that we can build RHEL packages from it as well. This commit is the result of running `go mod vendor`, which includes the vendored sources and updates go.mod and go.sum files. Fedora requires the opposite: dependencies should not be vendored. The spec file already ignores the `vendor` directory by default.
38 lines
966 B
Go
38 lines
966 B
Go
// +build go1.7
|
|
|
|
package httprouter
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
)
|
|
|
|
type paramsKey struct{}
|
|
|
|
// ParamsKey is the request context key under which URL params are stored.
|
|
//
|
|
// This is only present from go 1.7.
|
|
var ParamsKey = paramsKey{}
|
|
|
|
// Handler is an adapter which allows the usage of an http.Handler as a
|
|
// request handle. With go 1.7+, the Params will be available in the
|
|
// request context under ParamsKey.
|
|
func (r *Router) Handler(method, path string, handler http.Handler) {
|
|
r.Handle(method, path,
|
|
func(w http.ResponseWriter, req *http.Request, p Params) {
|
|
ctx := req.Context()
|
|
ctx = context.WithValue(ctx, ParamsKey, p)
|
|
req = req.WithContext(ctx)
|
|
handler.ServeHTTP(w, req)
|
|
},
|
|
)
|
|
}
|
|
|
|
// ParamsFromContext pulls the URL parameters from a request context,
|
|
// or returns nil if none are present.
|
|
//
|
|
// This is only present from go 1.7.
|
|
func ParamsFromContext(ctx context.Context) Params {
|
|
p, _ := ctx.Value(ParamsKey).(Params)
|
|
return p
|
|
}
|