ffmpeg: follow relative redirects

calzoneman · Mar 26, 2016 · 52e444a · 52e444a
1 parent efdab32
commit 52e444a
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/ffmpeg.js b/src/ffmpeg.js
@@ -38,6 +38,14 @@ function initFFLog() {
     fflog.initialized = true;
 }
 
+function fixRedirectIfNeeded(urldata, redirect) {
+    if (!/^https?:/.test(redirect)) {
+        redirect = urldata.protocol + "//" + urldata.host + redirect;
+    }
+
+    return redirect;
+}
+
 function testUrl(url, cb, redirCount) {
     if (!redirCount) redirCount = 0;
     var data = urlparse.parse(url);
@@ -59,7 +67,8 @@ function testUrl(url, cb, redirCount) {
                 return cb("Too many redirects.  Please provide a direct link to the " +
                           "file");
             }
-            return testUrl(res.headers["location"], cb, redirCount + 1);
+            return testUrl(fixRedirectIfNeeded(data, res.headers["location"]), cb,
+                    redirCount + 1);
         }
 
         if (res.statusCode !== 200) {