Merge pull request #260 from dkolbly/master

Replace "+" in object queries with "%2B"
AdRoll · Nov 7, 2014 · 72b2a7f · 72b2a7f
2 parents d4bb696 + ecb71ce
commit 72b2a7f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/s3/s3.go b/s3/s3.go
@@ -949,7 +949,7 @@ func partiallyEscapedPath(path string) string {
 			}
 		}
 	}
-	return strings.Join(pathEscapedAndSplit, "/")
+	return strings.Replace(strings.Join(pathEscapedAndSplit, "/"), "+", "%2B", -1)
 }
 
 // prepare sets up req to be delivered to S3.

diff --git a/s3/s3_test.go b/s3/s3_test.go
@@ -115,6 +115,17 @@ func (s *S) TestGet(c *check.C) {
 	c.Assert(string(data), check.Equals, "content")
 }
 
+func (s *S) TestGetWithPlus(c *check.C) {
+	testServer.Response(200, nil, "content")
+
+	b := s.s3.Bucket("bucket")
+	_, err := b.Get("has+plus")
+
+	req := testServer.WaitRequest()
+	c.Assert(err, check.IsNil)
+	c.Assert(req.RequestURI, check.Equals, "http://localhost:4444/bucket/has%2Bplus")
+}
+
 func (s *S) TestURL(c *check.C) {
 	testServer.Response(200, nil, "content")