1
0
mirror of https://github.com/kataras/iris.git synced 2026-01-09 13:05:56 +00:00
This commit is contained in:
Gerasimos (Makis) Maropoulos
2021-09-14 21:50:39 +03:00
parent fd80c3bee7
commit 11c1301cda
2 changed files with 28 additions and 22 deletions

View File

@@ -3,8 +3,10 @@ package router
import (
"fmt"
"net/http"
"strconv"
"strings"
"text/template"
"unicode/utf8"
"github.com/kataras/iris/v12/context"
"github.com/kataras/iris/v12/core/netutil"
@@ -217,7 +219,7 @@ func RedirectAbsolute(w http.ResponseWriter, r *http.Request, url string, code i
// Do it only if the request didn't already have a Content-Type header.
_, hadCT := h[context.ContentTypeHeaderKey]
h.Set("Location", url)
h.Set("Location", hexEscapeNonASCII(url))
if !hadCT && (r.Method == http.MethodGet || r.Method == http.MethodHead) {
h.Set(context.ContentTypeHeaderKey, "text/html; charset=utf-8")
}
@@ -229,3 +231,27 @@ func RedirectAbsolute(w http.ResponseWriter, r *http.Request, url string, code i
fmt.Fprintln(w, body)
}
}
func hexEscapeNonASCII(s string) string { // part of the standard library.
newLen := 0
for i := 0; i < len(s); i++ {
if s[i] >= utf8.RuneSelf {
newLen += 3
} else {
newLen++
}
}
if newLen == len(s) {
return s
}
b := make([]byte, 0, newLen)
for i := 0; i < len(s); i++ {
if s[i] >= utf8.RuneSelf {
b = append(b, '%')
b = strconv.AppendInt(b, int64(s[i]), 16)
} else {
b = append(b, s[i])
}
}
return string(b)
}