projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21508: Fix cross origin io parameter image previews
[arvados.git]
/
services
/
keepproxy
/
keepproxy.go
diff --git
a/services/keepproxy/keepproxy.go
b/services/keepproxy/keepproxy.go
index a79883147b5c4dc95ddb003686f0d3f1d73b9240..39ffd45cbe37b69f663dc6093acd4dfe221c74a1 100644
(file)
--- a/
services/keepproxy/keepproxy.go
+++ b/
services/keepproxy/keepproxy.go
@@
-304,7
+304,6
@@
func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) {
var err error
var status int
var expectLength, responseLength int64
var err error
var status int
var expectLength, responseLength int64
- var proxiedURI = "-"
logger := ctxlog.FromContext(req.Context())
defer func() {
logger := ctxlog.FromContext(req.Context())
defer func() {
@@
-312,7
+311,6
@@
func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) {
"locator": locator,
"expectLength": expectLength,
"responseLength": responseLength,
"locator": locator,
"expectLength": expectLength,
"responseLength": responseLength,
- "proxiedURI": proxiedURI,
"err": err,
})
if status != http.StatusOK {
"err": err,
})
if status != http.StatusOK {
@@
-321,6
+319,7
@@
func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) {
}()
kc := h.makeKeepClient(req)
}()
kc := h.makeKeepClient(req)
+ kc.DiskCacheSize = keepclient.DiskCacheDisabled
var pass bool
var tok string
var pass bool
var tok string
@@
-345,9
+344,9
@@
func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) {
switch req.Method {
case "HEAD":
switch req.Method {
case "HEAD":
- expectLength,
proxiedURI
, err = kc.Ask(locator)
+ expectLength,
_
, err = kc.Ask(locator)
case "GET":
case "GET":
- reader, expectLength,
proxiedURI
, err = kc.Get(locator)
+ reader, expectLength,
_
, err = kc.Get(locator)
if reader != nil {
defer reader.Close()
}
if reader != nil {
defer reader.Close()
}