Decoupled the blocking stat() call from the makeRequest() method.

Author: SaltwaterC

lib/aws.js

@@ -234,6 +234,11 @@ var client = function (config) {
 			if ( ! path) {
 				return;
 			}
+			if (body.file) {
+				body.file = p.resolve(body.file);
+				// XXX wrap into a callback in order to remove this blocking call
+				headers['content-length'] = fs.statSync(body.file).size;
+			}
 			if ( ! headers['content-length']) {
 				headers = tools.merge(headers, {'content-length': 0});
 			}

lib/internals.js

@@ -74,15 +74,8 @@ var makeRequest = function (config, options, body, handler, callback, requestId)
 					haveBodyHandler = true;
 				}
 				if ( ! haveBodyHandler) {
-					try {
-						if ( ! body.file) {
-							throw new Error('Invalid body handler, expecting a file path.');
-						}
-						var bf = p.resolve(body.file);
-						// XXX wrap the body handler into a callback in order to remove this blocking call
-						options.headers['content-length'] = fs.statSync(bf).size;
-					} catch (err) {
-						callback(err);
+					if ( ! body.file) {
+						callback(new Error('Invalid body handler, expecting a file path.'));
 						return;
 					}
 				}
@@ -272,7 +265,7 @@ var makeRequest = function (config, options, body, handler, callback, requestId)
 				return;
 			}
 			if ( ! haveBodyHandler) {
-				var bfile = fs.ReadStream(bf);
+				var bfile = fs.ReadStream(body.file);
 				bfile.on('data', function (chunk) {
 				if ( ! aborted) {
 						request.write(chunk);