From 5c195044a275b50258a0cd9d96aeba4aa9b58d93 Mon Sep 17 00:00:00 2001
From: Jonathan Clem <jclem@github.com>
Date: Tue, 17 Nov 2020 09:09:40 -0500
Subject: [PATCH] Update node-fetch cached license

---
 .licenses/npm/node-fetch.dep.yml | Bin 2489 -> 2796 bytes
 dist/index.js                    |  11 +++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.licenses/npm/node-fetch.dep.yml b/.licenses/npm/node-fetch.dep.yml
index 109c6d07ba8c1f0dc04fb7b56d253090019e3cd2..0139d5fe0012a35c1dd691dcc054682d8f6fd26f 100644
GIT binary patch
delta 311
zcmZvW!43g26h*^EVk`DSNGzt!6k|p*5s9xL7M=F#G&)n-5*FeY{EArlCm(?zA-v^%
zH|N|-<yt+~3;wCGFCDnFOdIaWj0%_yYN>NeJHS|G0@+l8;ucAbUo{-~QRMf+ZkGgM
zhXhfN44GEi#7)xalQ0^OT8bv1;_;K)vTmm!o-67+yINBN<=XwGZ|z}i)Q9yIBO&l)
zo8+8j&$?bhe)lL~PHy05?Drcno#9+_@aEuHiWABfU@Wp5@k47qaNisLz|O}~yLba^
CR%?U+

delta 17
YcmaDOx>I<95~IOJ<y!X5mpLSv06D$|vH$=8

diff --git a/dist/index.js b/dist/index.js
index c355d89..91501d1 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -3753,6 +3753,12 @@ function convertBody(buffer, headers) {
 	// html4
 	if (!res && str) {
 		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
+		if (!res) {
+			res = /<meta[\s]+?content=(['"])(.+?)\1[\s]+?http-equiv=(['"])content-type\3/i.exec(str);
+			if (res) {
+				res.pop(); // drop last quote
+			}
+		}
 
 		if (res) {
 			res = /charset=(.*)/i.exec(res.pop());
@@ -4760,7 +4766,7 @@ function fetch(url, opts) {
 				// HTTP fetch step 5.5
 				switch (request.redirect) {
 					case 'error':
-						reject(new FetchError(`redirect mode is set to error: ${request.url}`, 'no-redirect'));
+						reject(new FetchError(`uri requested responds with a redirect, redirect mode is set to error: ${request.url}`, 'no-redirect'));
 						finalize();
 						return;
 					case 'manual':
@@ -4799,7 +4805,8 @@ function fetch(url, opts) {
 							method: request.method,
 							body: request.body,
 							signal: request.signal,
-							timeout: request.timeout
+							timeout: request.timeout,
+							size: request.size
 						};
 
 						// HTTP-redirect fetch step 9