2 files changed, 11 insertions, 2 deletions

diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go
index 18169f0..60e5b09 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go
@@ -25,7 +25,7 @@ func Build(r *request.Request) {
                 return
         }
 
-        if r.ExpireTime == 0 {
+        if !r.IsPresigned() {
                 r.HTTPRequest.Method = "POST"
                 r.HTTPRequest.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")
                 r.SetBufferBody([]byte(body.Encode()))
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
index 524ca95..75866d0 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
@@ -121,6 +121,10 @@ func (q *queryParser) parseList(v url.Values, value reflect.Value, prefix string
                 return nil
         }
 
+        if _, ok := value.Interface().([]byte); ok {
+                return q.parseScalar(v, value, prefix, tag)
+        }
+
         // check for unflattened list member
         if !q.isEC2 && tag.Get("flattened") == "" {
                 if listName := tag.Get("locationNameList"); listName == "" {
@@ -229,7 +233,12 @@ func (q *queryParser) parseScalar(v url.Values, r reflect.Value, name string, ta
                 v.Set(name, strconv.FormatFloat(float64(value), 'f', -1, 32))
         case time.Time:
                 const ISO8601UTC = "2006-01-02T15:04:05Z"
-                v.Set(name, value.UTC().Format(ISO8601UTC))
+                format := tag.Get("timestampFormat")
+                if len(format) == 0 {
+                        format = protocol.ISO8601TimeFormatName
+                }
+
+                v.Set(name, protocol.FormatTime(format, value))
         default:
                 return fmt.Errorf("unsupported value for param %s: %v (%s)", name, r.Interface(), r.Type().Name())
         }