From 2930831885a786014fedaa4c2ae13ff77e52cb9a Mon Sep 17 00:00:00 2001
From: Shunichi Shinohara <shino@basho.com>
Date: Thu, 12 Mar 2015 17:25:25 +0900
Subject: [PATCH] URL-decode subresource values as well as other query
 parameters

---
 lib/signers/s3.js           | 6 +-----
 test/signers/s3.spec.coffee | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/signers/s3.js b/lib/signers/s3.js
index 2f49fff979..c033e21a3c 100644
--- a/lib/signers/s3.js
+++ b/lib/signers/s3.js
@@ -127,11 +127,7 @@ AWS.Signers.S3 = inherit(AWS.Signers.RequestSigner, {
         if (this.subResources[name] || this.responseHeaders[name]) {
           var subresource = { name: name };
           if (value !== undefined) {
-            if (this.subResources[name]) {
-              subresource.value = value;
-            } else {
-              subresource.value = decodeURIComponent(value);
-            }
+            subresource.value = decodeURIComponent(value);
           }
           resources.push(subresource);
         }
diff --git a/test/signers/s3.spec.coffee b/test/signers/s3.spec.coffee
index ea102f357d..edf2abcdff 100644
--- a/test/signers/s3.spec.coffee
+++ b/test/signers/s3.spec.coffee
@@ -273,7 +273,7 @@ describe 'AWS.Signers.S3', ->
 
 
       x-amz-date:DATE-STRING
-      /?versionId=a%2Bb
+      /?versionId=a+b
       """)
 
     it 'includes the non-encoded query string get header overrides', ->