[squash] 2100

constants.js

@@ -76,7 +76,7 @@ const constants = {
     // AWS states max size for user-defined metadata (x-amz-meta- headers) is
     // 2 KB: http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html
     // In testing, AWS seems to allow up to 88 more bytes, so we do the same.
-    maximumMetaHeadersSize: 2136,
+    maximumMetaHeadersSize: 2100,
 
     // hex digest of sha256 hash of empty string:
     emptyStringHash: crypto.createHash('sha256')

tests/functional/aws-node-sdk/test/object/objectCopy.js

@@ -368,7 +368,7 @@ describe('Object Copy', () => {
                         done();
                     });
                 });
-            });
+            }).timeout(60000);
 
         it('should return error if copying object w/ > 2KB ' +
         'user-defined md and REPLACE directive',
@@ -392,7 +392,7 @@ describe('Object Copy', () => {
                         done();
                     });
                 });
-            });
+            }).timeout(60000);
 
         it('should copy an object from a source to the same destination ' +
             '(update metadata)', done => {