refactor(serverHandler): reorder params

Author: marjune163

src/serverHandler/aliasHandler.go

@@ -32,13 +32,13 @@ type aliasParam struct {
 	hideDirs  *regexp.Regexp
 	hideFiles *regexp.Regexp
 
-	headersUrls []pathHeaders
-	headersDirs []pathHeaders
-
 	restrictAccess     bool
 	restrictAccessUrls []pathStrings
 	restrictAccessDirs []pathStrings
 
+	headersUrls []pathHeaders
+	headersDirs []pathHeaders
+
 	pageVaryV1    string
 	pageVary      string
 	contentVaryV1 string
@@ -69,6 +69,10 @@ type aliasHandler struct {
 	dirIndexes []string
 	aliases    aliases
 
+	globalAuth bool
+	authUrls   []string
+	authDirs   []string
+
 	restrictAccess       bool
 	globalRestrictAccess []string
 	restrictAccessUrls   []pathStrings
@@ -98,10 +102,6 @@ type aliasHandler struct {
 	corsUrls   []string
 	corsDirs   []string
 
-	globalAuth bool
-	authUrls   []string
-	authDirs   []string
-
 	pageVaryV1    string
 	pageVary      string
 	contentVaryV1 string
@@ -239,6 +239,10 @@ func newAliasHandler(
 		dirIndexes: p.DirIndexes,
 		aliases:    aliases,
 
+		globalAuth: p.GlobalAuth,
+		authUrls:   p.AuthUrls,
+		authDirs:   p.AuthDirs,
+
 		restrictAccess:       ap.restrictAccess,
 		globalRestrictAccess: p.GlobalRestrictAccess,
 		restrictAccessUrls:   ap.restrictAccessUrls,
@@ -268,10 +272,6 @@ func newAliasHandler(
 		corsUrls:   p.CorsUrls,
 		corsDirs:   p.CorsDirs,
 
-		globalAuth: p.GlobalAuth,
-		authUrls:   p.AuthUrls,
-		authDirs:   p.AuthDirs,
-
 		shows:     ap.shows,
 		showDirs:  ap.showDirs,
 		showFiles: ap.showFiles,

src/serverHandler/vhostHandler.go

@@ -90,13 +90,13 @@ func NewVhostHandler(
 		hideDirs:  hideDirs,
 		hideFiles: hideFiles,
 
-		headersUrls: newPathHeaders(p.HeadersUrls),
-		headersDirs: newPathHeaders(p.HeadersDirs),
-
 		restrictAccess:     restrictAccess,
 		restrictAccessUrls: restrictAccessUrls,
 		restrictAccessDirs: restrictAccessDirs,
 
+		headersUrls: newPathHeaders(p.HeadersUrls),
+		headersDirs: newPathHeaders(p.HeadersDirs),
+
 		pageVaryV1:    pageVaryV1,
 		pageVary:      pageVary,
 		contentVaryV1: contentVaryV1,