[ARVADOS] updated: c164cb15f8435817784a71c45fbd7e6c6690d3cd

[git at public.curoverse.com]

Summary of changes:
 services/keep/src/arvados.org/keepproxy/keepproxy.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  c164cb15f8435817784a71c45fbd7e6c6690d3cd (commit)
      from  9878a4d9e0b535a13a323dfb8776866b542ece1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c164cb15f8435817784a71c45fbd7e6c6690d3cd
Author: Peter Amstutz <tetron at peter.shell.qr1hi.arvadosapi.com>
Date:   Tue Jun 17 14:21:41 2014 +0000

    Fixed bug in Keep proxy when talking to Keep server that doesn't report
    Content-Length correctly.  no issue #

diff --git a/services/keep/src/arvados.org/keepproxy/keepproxy.go b/services/keep/src/arvados.org/keepproxy/keepproxy.go
index 56de1e1..e3a2ce9 100644
--- a/services/keep/src/arvados.org/keepproxy/keepproxy.go
+++ b/services/keep/src/arvados.org/keepproxy/keepproxy.go
@@ -297,14 +297,16 @@ func (this GetBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques
 		blocklen, _, err = kc.AuthorizedAsk(hash, locator.Signature, locator.Timestamp)
 	}
 
-	resp.Header().Set("Content-Length", fmt.Sprint(blocklen))
+	if blocklen > 0 {
+		resp.Header().Set("Content-Length", fmt.Sprint(blocklen))
+	}
 
 	switch err {
 	case nil:
 		if reader != nil {
 			n, err2 := io.Copy(resp, reader)
 			if n != blocklen {
-				log.Printf("%s: %s %s mismatched return %v with Content-Length %v error", GetRemoteAddress(req), req.Method, hash, n, blocklen, err.Error())
+				log.Printf("%s: %s %s mismatched return %v with Content-Length %v error %v", GetRemoteAddress(req), req.Method, hash, n, blocklen, err2)
 			} else if err2 == nil {
 				log.Printf("%s: %s %s success returned %v bytes", GetRemoteAddress(req), req.Method, hash, n)
 			} else {

-----------------------------------------------------------------------


hooks/post-receive
--