Merge pull request #392 from wangmingshuai/master

S3 Compatible:support RadosGW when using goamz in docker registry
AdRoll · Sep 1, 2015 · 01b9e62 · 01b9e62
2 parents 509360a + e5e3387
commit 01b9e62
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/s3/multi.go b/s3/multi.go
@@ -8,6 +8,7 @@ import (
 	"encoding/xml"
 	"errors"
 	"io"
+	"net/http"
 	"net/url"
 	"sort"
 	"strconv"
@@ -428,6 +429,11 @@ func (m *Multi) Complete(parts []Part) error {
 			payload: bytes.NewReader(data),
 		}
 		var resp completeUploadResp
+		if m.Bucket.Region.Name == "generic" {
+			headers := make(http.Header)
+			headers.Add("Content-Length", strconv.FormatInt(int64(len(data)), 10))
+			req.headers = headers
+		}
 		err := m.Bucket.S3.query(req, &resp)
 		if shouldRetry(err) && attempt.HasNext() {
 			continue

diff --git a/s3/s3.go b/s3/s3.go
@@ -1111,7 +1111,9 @@ func (s3 *S3) setupHttpRequest(req *request) (*http.Request, error) {
 	if err != nil {
 		return nil, err
 	}
-	u.Opaque = fmt.Sprintf("//%s%s", u.Host, partiallyEscapedPath(u.Path))
+	if s3.Region.Name != "generic" {
+		u.Opaque = fmt.Sprintf("//%s%s", u.Host, partiallyEscapedPath(u.Path))
+	}
 
 	hreq := http.Request{
 		URL:        u,