Merge pull request #25650 from pwzgorilla/master

replace `handleWithGlobalMiddlewares` with `handlerWithGlobalMiddlewa…

api/server/middleware.go

@@ -6,10 +6,10 @@ import (
 	"github.com/docker/docker/api/server/middleware"
 )
 
-// handleWithGlobalMiddlwares wraps the handler function for a request with
+// handlerWithGlobalMiddlewares wraps the handler function for a request with
 // the server's global middlewares. The order of the middlewares is backwards,
 // meaning that the first in the list will be evaluated last.
-func (s *Server) handleWithGlobalMiddlewares(handler httputils.APIFunc) httputils.APIFunc {
+func (s *Server) handlerWithGlobalMiddlewares(handler httputils.APIFunc) httputils.APIFunc {
 	next := handler
 
 	for _, m := range s.middlewares {

api/server/server.go

@@ -129,7 +129,7 @@ func (s *Server) makeHTTPHandler(handler httputils.APIFunc) http.HandlerFunc {
 		// immediate function being called should still be passed
 		// as 'args' on the function call.
 		ctx := context.Background()
-		handlerFunc := s.handleWithGlobalMiddlewares(handler)
+		handlerFunc := s.handlerWithGlobalMiddlewares(handler)
 
 		vars := mux.Vars(r)
 		if vars == nil {

api/server/server_test.go

@@ -39,7 +39,7 @@ func TestMiddlewares(t *testing.T) {
 		return nil
 	}
 
-	handlerFunc := srv.handleWithGlobalMiddlewares(localHandler)
+	handlerFunc := srv.handlerWithGlobalMiddlewares(localHandler)
 	if err := handlerFunc(ctx, resp, req, map[string]string{}); err != nil {
 		t.Fatal(err)
 	}