diff --git a/go.mod b/go.mod index 571943c54c3671d04bee00185691c58a16d4665c..074464281d34bf29ecbaa38606c6a104a8d6b2de 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,10 @@ module git.kuschku.de/justjanne/bahn-proxy go 1.12 require ( - git.kuschku.de/justjanne/bahn-api v0.0.0-20190504153151-3f6741590505 + git.kuschku.de/justjanne/bahn-api v0.0.0-20190504160313-5e30ecd44bd3 github.com/go-redis/cache v6.3.5+incompatible github.com/go-redis/redis v6.15.2+incompatible + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/patrickmn/go-cache v2.1.0+incompatible gopkg.in/yaml.v2 v2.2.2 ) diff --git a/go.sum b/go.sum index ce54561253b6a8c3b85c366409e85981c1127705..f42a2773f7a053f696c5ae3237915684c6b7d14b 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,20 @@ -git.kuschku.de/justjanne/bahn-api v0.0.0-20190504153151-3f6741590505 h1:5ZpJaz2ltYxdBpqPGVdLfVgUx0GIQ+h+Kt9o/qI/JzI= -git.kuschku.de/justjanne/bahn-api v0.0.0-20190504153151-3f6741590505/go.mod h1:WQsAQzBR+0dlaVVuwwkx8j5uMoWDIdc8xtX4vlRrp5E= +git.kuschku.de/justjanne/bahn-api v0.0.0-20190504155414-dc55c2c13a0e/go.mod h1:EHmQs/TNmFmd0+CqjhE28kCKTnWoEOaP3N3tS2vilPo= +git.kuschku.de/justjanne/bahn-api v0.0.0-20190504160313-5e30ecd44bd3 h1:EJhvTmuP84iEgWirYHaIWObBoNcKuaaJPuNU0FrIg6k= +git.kuschku.de/justjanne/bahn-api v0.0.0-20190504160313-5e30ecd44bd3/go.mod h1:rzJ5eu/KKeWxt1lUkVioHhhuvPYNCOKU/VzTWPW3S38= github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o= github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/go-redis/cache v6.3.5+incompatible h1:4OUyoXXYRRQ6tKA4ue3TlPUkBzk3occzjtXBZBxCzgs= github.com/go-redis/cache v6.3.5+incompatible/go.mod h1:XNnMdvlNjcZvHjsscEozHAeOeSE5riG9Fj54meG4WT4= github.com/go-redis/redis v6.15.2+incompatible h1:9SpNVG76gr6InJGxoZ6IuuxaCOQwDAhzyXg+Bs+0Sb4= github.com/go-redis/redis v6.15.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/google/logger v1.0.1/go.mod h1:w7O8nrRr0xufejBlQMI83MXqRusvREoJdaAxV+CoAB4= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01 h1:po1f06KS05FvIQQA2pMuOWZAUXiy1KYdIf0ElUU2Hhc= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/main.go b/main.go index a3a4cdc207ac3cd495b17787fc817a78ba8afee2..7e821f731ce0337bac88f31369d702f72b030d2b 100644 --- a/main.go +++ b/main.go @@ -22,7 +22,7 @@ func returnJson(w http.ResponseWriter, data interface{}) error { return err } - w.Header().Add("Content-Type", "application/json") + w.Header().Add("Content-Type", "application/json; charset=utf-8") if _, err := w.Write(marshalled); err != nil { return err }