feat(serverHandler): use unique Vary header for protocol versions

Author: marjune163

src/serverHandler/aliasHandler.go

@@ -40,10 +40,8 @@ type aliasParam struct {
 	headersUrls []pathHeaders
 	headersDirs []pathHeaders
 
-	pageVaryV1    string
-	pageVary      string
-	contentVaryV1 string
-	contentVary   string
+	pageVary    string
+	contentVary string
 }
 
 type aliasHandler struct {
@@ -104,10 +102,8 @@ type aliasHandler struct {
 	corsUrls   []string
 	corsDirs   []string
 
-	pageVaryV1    string
-	pageVary      string
-	contentVaryV1 string
-	contentVary   string
+	pageVary    string
+	contentVary string
 
 	postMiddlewares []middleware.Middleware
 
@@ -284,10 +280,8 @@ func newAliasHandler(
 
 		fileServer: fileServer,
 
-		pageVaryV1:    ap.pageVaryV1,
-		pageVary:      ap.pageVary,
-		contentVaryV1: ap.contentVaryV1,
-		contentVary:   ap.contentVary,
+		pageVary:    ap.pageVary,
+		contentVary: ap.contentVary,
 
 		postMiddlewares: p.PostMiddlewares,
 	}

src/serverHandler/content.go

@@ -16,14 +16,8 @@ var serveContent = func(h *aliasHandler, w http.ResponseWriter, r *http.Request,
 func (h *aliasHandler) content(w http.ResponseWriter, r *http.Request, data *responseData) {
 	header := w.Header()
 	header.Set("X-Content-Type-Options", "nosniff")
-	if r.ProtoMajor <= 1 {
-		if len(h.contentVaryV1) > 0 {
-			header.Set("Vary", h.contentVaryV1)
-		}
-	} else {
-		if len(h.contentVary) > 0 {
-			header.Set("Vary", h.contentVary)
-		}
+	if len(h.contentVary) > 0 {
+		header.Set("Vary", h.contentVary)
 	}
 	if data.IsDownload {
 		header.Set("Content-Disposition", "attachment; filename*=UTF-8''"+url.PathEscape(data.ItemName))

src/serverHandler/page.go

@@ -69,10 +69,7 @@ func (h *aliasHandler) page(w http.ResponseWriter, r *http.Request, data *respon
 	if lacksHeader(header, "Cache-Control") {
 		header.Set("Cache-Control", "public, max-age=0")
 	}
-
-	if r.ProtoMajor <= 1 {
-		header.Set("Vary", h.pageVaryV1)
-	} else {
+	if len(h.pageVary) > 0 {
 		header.Set("Vary", h.pageVary)
 	}
 

src/serverHandler/vhostHandler.go

@@ -60,18 +60,15 @@ func NewVhostHandler(
 	restrictAccess := hasRestrictAccess(p.GlobalRestrictAccess, restrictAccessUrls, restrictAccessDirs)
 
 	// `Vary` header
-	pageVarys := make([]string, 0, 4)
-	contentVarys := make([]string, 0, 3)
-	pageVarys = append(pageVarys, "Accept-Encoding")
+	pageVarys := make([]string, 0, 3)
+	contentVarys := make([]string, 0, 2)
+	pageVarys = append(pageVarys, "accept-encoding")
 	if restrictAccess {
-		pageVarys = append(pageVarys, "Referer", "Origin")
-		contentVarys = append(contentVarys, "Referer", "Origin")
+		pageVarys = append(pageVarys, "referer", "origin")
+		contentVarys = append(contentVarys, "referer", "origin")
 	}
-
-	pageVaryV1 := strings.Join(pageVarys, ", ")
-	contentVaryV1 := strings.Join(contentVarys, ", ")
-	pageVary := strings.ToLower(pageVaryV1)
-	contentVary := strings.ToLower(contentVaryV1)
+	pageVary := strings.Join(pageVarys, ", ")
+	contentVary := strings.Join(contentVarys, ", ")
 
 	// alias param
 	ap := &aliasParam{
@@ -93,10 +90,8 @@ func NewVhostHandler(
 		headersUrls: newPathHeaders(p.HeadersUrls),
 		headersDirs: newPathHeaders(p.HeadersDirs),
 
-		pageVaryV1:    pageVaryV1,
-		pageVary:      pageVary,
-		contentVaryV1: contentVaryV1,
-		contentVary:   contentVary,
+		pageVary:    pageVary,
+		contentVary: contentVary,
 	}
 
 	muxHandler := newMultiplexHandler(p, ap)