Unify calculating content-length (#544)

sindresorhus · Aug 3, 2018 · ba0cb0d · ba0cb0d
1 parent 5c3adba
commit ba0cb0d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/source/get-body-size.js b/source/get-body-size.js
@@ -19,6 +19,10 @@ module.exports = async options => {
 		return Buffer.byteLength(body);
 	}
 
+	if (is.buffer(body)) {
+		return body.length;
+	}
+
 	if (isFormData(body)) {
 		return util.promisify(body.getLength.bind(body))();
 	}

diff --git a/source/normalize-arguments.js b/source/normalize-arguments.js
@@ -108,11 +108,6 @@ module.exports = (url, options, defaults) => {
 			options.body = JSON.stringify(body);
 		}
 
-		if (is.undefined(headers['content-length']) && is.undefined(headers['transfer-encoding']) && !is.nodeStream(body)) {
-			const length = is.string(options.body) ? Buffer.byteLength(options.body) : options.body.length;
-			headers['content-length'] = length;
-		}
-
 		// Convert buffer to stream to receive upload progress events (#322)
 		if (is.buffer(body)) {
 			options.body = toReadableStream(body);

diff --git a/source/request-as-event-emitter.js b/source/request-as-event-emitter.js
@@ -162,10 +162,6 @@ module.exports = options => {
 		try {
 			uploadBodySize = await getBodySize(options);
 
-			// This is the second try at setting a `content-length` header.
-			// This supports getting the size async, in contrast to
-			// https://github.com/sindresorhus/got/blob/82763c8089596dcee5eaa7f57f5dbf8194842fe6/index.js#L579-L582
-			// TODO: We should unify these two at some point
 			if (
 				uploadBodySize > 0 &&
 				is.undefined(options.headers['content-length']) &&