Merge remote-tracking branch 'origin/master' into feature/websockets-plugin

# Conflicts:
#	plugins/http/plugin.go
#	plugins/static/etag.go

1 files changed, 12 insertions, 0 deletions

diff --git a/plugins/http/serve.go b/plugins/http/serve.go
index 26fccf79..734860f5 100644
--- a/plugins/http/serve.go
+++ b/plugins/http/serve.go
@@ -231,12 +231,24 @@ func (s *Plugin) tlsAddr(host string, forcePort bool) string {
 	return host
 }
 
+// static plugin name
+const static string = "static"
+
 func applyMiddlewares(server *http.Server, middlewares map[string]Middleware, order []string, log logger.Logger) {
 	for i := len(order) - 1; i >= 0; i-- {
+		// set static last in the row
+		if order[i] == static {
+			continue
+		}
 		if mdwr, ok := middlewares[order[i]]; ok {
 			server.Handler = mdwr.Middleware(server.Handler)
 		} else {
 			log.Warn("requested middleware does not exist", "requested", order[i])
 		}
 	}
+
+	// set static if exists
+	if mdwr, ok := middlewares[static]; ok {
+		server.Handler = mdwr.Middleware(server.Handler)
+	}
 }