Merge branch 'develop' of https://github.com/tendermint/tendermint into develop
This commit is contained in:
commit
dc8e327754
|
@ -12,10 +12,6 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
|
||||||
// TODO: seed rand?
|
|
||||||
}
|
|
||||||
|
|
||||||
func randstr(length int) string {
|
func randstr(length int) string {
|
||||||
return RandStr(length)
|
return RandStr(length)
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,19 +48,10 @@ func RecoverAndLogHandler(handler http.Handler) http.Handler {
|
||||||
begin := time.Now()
|
begin := time.Now()
|
||||||
|
|
||||||
// Common headers
|
// Common headers
|
||||||
rww.Header().Set("Access-Control-Allow-Origin", "*")
|
origin := r.Header.Get("Origin")
|
||||||
/*
|
rww.Header().Set("Access-Control-Allow-Origin", origin)
|
||||||
origin := r.Header.Get("Origin")
|
rww.Header().Set("Access-Control-Allow-Credentials", "true")
|
||||||
originUrl, err := url.Parse(origin)
|
rww.Header().Set("Access-Control-Expose-Headers", "X-Server-Time")
|
||||||
if err == nil {
|
|
||||||
originHost := strings.Split(originUrl.Host, ":")[0]
|
|
||||||
if strings.HasSuffix(originHost, ".tendermint.com") {
|
|
||||||
rww.Header().Set("Access-Control-Allow-Origin", origin)
|
|
||||||
rww.Header().Set("Access-Control-Allow-Credentials", "true")
|
|
||||||
rww.Header().Set("Access-Control-Expose-Headers", "X-Server-Time")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
rww.Header().Set("X-Server-Time", fmt.Sprintf("%v", begin.Unix()))
|
rww.Header().Set("X-Server-Time", fmt.Sprintf("%v", begin.Unix()))
|
||||||
|
|
||||||
defer func() {
|
defer func() {
|
||||||
|
|
Loading…
Reference in New Issue