Mercurial > gemma

changeset 3093:fd14f149696c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GeoServer style import: Be aware that the uploaded style could be in other encodings than UTF-8.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 23 Apr 2019 10:59:20 +0200
parents 7dc9660df743
children a347468ea545
files pkg/geoserver/boot.go
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/geoserver/boot.go	Tue Apr 23 10:12:31 2019 +0200
+++ b/pkg/geoserver/boot.go	Tue Apr 23 10:59:20 2019 +0200
@@ -24,6 +24,8 @@
 	"net/url"
 	"strings"
 
+	"golang.org/x/net/html/charset"
+
 	"gemma.intevation.de/gemma/pkg/config"
 	"gemma.intevation.de/gemma/pkg/models"
 )
@@ -496,6 +498,8 @@
 // isSymbologyEncoding tries to figure out if its plain SLD or SE.
 func isSymbologyEncoding(data string) bool {
 	decoder := xml.NewDecoder(strings.NewReader(data))
+	decoder.CharsetReader = charset.NewReaderLabel
+
 	for {
 		tok, err := decoder.Token()
 		switch {