@@ -121,11 +121,11 @@ func readdir(file *os.File, item os.FileInfo, visitFs bool) (subItems []os.FileI
121
121
return file .Readdir (0 )
122
122
}
123
123
124
- func (h * handler ) mergeAlias (item os.FileInfo , rawRequestPath string , subItems * []os.FileInfo ) [] error {
124
+ func (h * handler ) mergeAlias (rawRequestPath string , item os.FileInfo , subItems []os.FileInfo ) ([]os. FileInfo , [] error ) {
125
125
errs := []error {}
126
126
127
127
if item == nil || ! item .IsDir () {
128
- return errs
128
+ return subItems , errs
129
129
}
130
130
131
131
for _ , alias := range h .aliases {
@@ -178,20 +178,20 @@ func (h *handler) mergeAlias(item os.FileInfo, rawRequestPath string, subItems *
178
178
}
179
179
180
180
replaced := false
181
- for i , subItem := range * subItems {
181
+ for i , subItem := range subItems {
182
182
if subItem .Name () == nextName {
183
- ( * subItems ) [i ] = aliasSubItem
183
+ subItems [i ] = aliasSubItem
184
184
replaced = true
185
185
break
186
186
}
187
187
}
188
188
189
189
if ! replaced {
190
- * subItems = append (* subItems , aliasSubItem )
190
+ subItems = append (subItems , aliasSubItem )
191
191
}
192
192
}
193
193
194
- return errs
194
+ return subItems , errs
195
195
}
196
196
197
197
func getSubItemPrefix (requestPath string , tailSlash bool ) (subItemPrefix string ) {
@@ -311,7 +311,7 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
311
311
status = http .StatusInternalServerError
312
312
}
313
313
314
- _mergeErrs := h .mergeAlias (item , rawReqPath , & subInfos )
314
+ subInfos , _mergeErrs := h .mergeAlias (rawReqPath , item , subInfos )
315
315
if len (_mergeErrs ) > 0 {
316
316
errs = append (errs , _mergeErrs ... )
317
317
status = http .StatusInternalServerError
0 commit comments