[ARVADOS] updated: 1.1.0-27-g60e0be4

Git user git at public.curoverse.com
Mon Oct 16 13:01:22 EDT 2017


Summary of changes:
 sdk/go/keepclient/collectionreader_test.go | 1 +
 sdk/go/keepclient/keepclient.go            | 3 +++
 2 files changed, 4 insertions(+)

       via  60e0be49f6fa0e24349635621acb4f7d273064d9 (commit)
      from  237adbd91e2dc0d15f79390f7e38f70d55372877 (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 60e0be49f6fa0e24349635621acb4f7d273064d9
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Oct 16 13:00:55 2017 -0400

    12447: Require Content-Length in KeepClient.Get
    
    Fix test stub to report Content-Length.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/go/keepclient/collectionreader_test.go b/sdk/go/keepclient/collectionreader_test.go
index 813a335..df8bcb3 100644
--- a/sdk/go/keepclient/collectionreader_test.go
+++ b/sdk/go/keepclient/collectionreader_test.go
@@ -82,6 +82,7 @@ func (h SuccessHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 		if !ok {
 			resp.WriteHeader(http.StatusNotFound)
 		} else {
+			resp.Header().Set("Content-Length", fmt.Sprintf("%d", len(buf)))
 			resp.Write(buf)
 		}
 	default:
diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index bc7aa24..6ed0d11 100644
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -246,6 +246,9 @@ func (kc *KeepClient) getOrHead(method string, locator string) (io.ReadCloser, i
 				} else if resp.StatusCode == 404 {
 					count404++
 				}
+			} else if resp.ContentLength < 0 {
+				// Missing Content-Length
+				return nil, 0, "", fmt.Errorf("Missing Content-Length of block")
 			} else {
 				// Success.
 				if method == "GET" {

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list