Merge branch 'master' into kd-live

This commit is contained in:
2023-06-23 16:53:16 +09:00

View File

@ -631,13 +631,6 @@ func (sh *serviceDescription) ServeHTTP(w http.ResponseWriter, r *http.Request)
return return
} }
servicecode := queryvals.Get("servicecode")
if sh.ServiceCode != servicecode {
logger.Println("service code is not valid :", servicecode, sh.ServiceCode)
w.WriteHeader(http.StatusUnauthorized)
return
}
divstrptr := atomic.LoadPointer(&sh.divisionsForUsersSerialized) divstrptr := atomic.LoadPointer(&sh.divisionsForUsersSerialized)
divstr := *(*string)(divstrptr) divstr := *(*string)(divstrptr)
w.Write([]byte(divstr)) w.Write([]byte(divstr))
@ -660,13 +653,6 @@ func (sh *serviceDescription) ServeHTTP(w http.ResponseWriter, r *http.Request)
return return
} }
servicecode := queryvals.Get("servicecode")
if sh.ServiceCode != servicecode {
logger.Println("service code is not valid :", servicecode, sh.ServiceCode)
w.WriteHeader(http.StatusUnauthorized)
return
}
divname := queryvals.Get("div") divname := queryvals.Get("div")
divname = strings.Trim(divname, `"`) divname = strings.Trim(divname, `"`)
div := sh.Divisions[divname] div := sh.Divisions[divname]