mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-10-31 15:42:59 +00:00
Code Issues Releases Wiki Activity

Update fetch commands to respect 302 redirects

Browse Source 
Astonishingly, node.js appears to require us to do this manually…
This commit is contained in:
Jermolene
2017-07-05 10:58:35 +01:00
parent 17fbe49f2b
commit 69528093d9
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/modules/commands/fetch.js
View File

@@ -92,7 +92,10 @@ Command.prototype.fetchFiles = function(options) {
return null; return null;
}; };
Command.prototype.fetchFile = function(url,options,callback) { Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
if(redirectCount > 10) {
return callback("Error too many redirects retrieving " + url);
}
var self = this, var self = this,
lib = url.substr(0,8) === "https://" ? require("https") : require("http"); lib = url.substr(0,8) === "https://" ? require("https") : require("http");
lib.get(url).on("response",function(response) { lib.get(url).on("response",function(response) {
@@ -109,7 +112,11 @@ Command.prototype.fetchFile = function(url,options,callback) {
self.processBody(Buffer.concat(data),type,options,url); self.processBody(Buffer.concat(data),type,options,url);
callback(null); callback(null);
} else { } else {
callback("Error " + response.statusCode + " retrieving " + url) if(response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
return self.fetchFile(response.headers.location,options,callback,redirectCount + 1);
} else {
return callback("Error " + response.statusCode + " retrieving " + url)
}
} }
}); });
response.on("error",function(e) { response.on("error",function(e) {