Merge pull request #48 from stevvooe/fix-client-hmac-state-support

Correctly assemble URL during blob upload
This commit is contained in:
Stephen Day 2015-01-07 14:24:08 -08:00
commit 69da73f69d

View file

@ -6,7 +6,6 @@ import (
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
"net/url"
"regexp" "regexp"
"strconv" "strconv"
@ -398,9 +397,9 @@ func (r *clientImpl) UploadBlob(location string, blob io.ReadCloser, length int,
return err return err
} }
queryValues := url.Values{} values := putRequest.URL.Query()
queryValues.Set("digest", dgst.String()) values.Set("digest", dgst.String())
putRequest.URL.RawQuery = queryValues.Encode() putRequest.URL.RawQuery = values.Encode()
putRequest.Header.Set("Content-Type", "application/octet-stream") putRequest.Header.Set("Content-Type", "application/octet-stream")
putRequest.Header.Set("Content-Length", fmt.Sprint(length)) putRequest.Header.Set("Content-Length", fmt.Sprint(length))
@ -486,9 +485,9 @@ func (r *clientImpl) FinishChunkedBlobUpload(location string, length int, dgst d
return err return err
} }
queryValues := new(url.Values) values := putRequest.URL.Query()
queryValues.Set("digest", dgst.String()) values.Set("digest", dgst.String())
putRequest.URL.RawQuery = queryValues.Encode() putRequest.URL.RawQuery = values.Encode()
putRequest.Header.Set("Content-Type", "application/octet-stream") putRequest.Header.Set("Content-Type", "application/octet-stream")
putRequest.Header.Set("Content-Length", "0") putRequest.Header.Set("Content-Length", "0")