From 40a0b366f602339e0a37e5c7fdf1af62b47a9548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Velad=20Galv=C3=A1n?= <alvaro.velad@mirada.tv>
Date: Thu, 17 Dec 2020 20:02:15 +0100
Subject: [PATCH] feat: Change default network request timeout (#3024)

The old default was 0 (effectively infinite, no timeout).  The new default is 30s.

Closes: #1578
---
 externs/shaka/net.js | 1 +
 lib/net/backoff.js   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/externs/shaka/net.js b/externs/shaka/net.js
index 7b08ebd90f..38ba8c518e 100644
--- a/externs/shaka/net.js
+++ b/externs/shaka/net.js
@@ -33,6 +33,7 @@
  *   For example, 0.5 means "between 50% below and 50% above the retry delay."
  * @property {number} timeout
  *   The request timeout, in milliseconds.  Zero means "unlimited".
+ *   <i>Defaults to 30000 milliseconds.</i>
  *
  * @tutorial network-and-buffering-config
  *
diff --git a/lib/net/backoff.js b/lib/net/backoff.js
index 2b4c894fc2..46bbf3611a 100644
--- a/lib/net/backoff.js
+++ b/lib/net/backoff.js
@@ -139,7 +139,7 @@ shaka.net.Backoff = class {
       baseDelay: 1000,
       backoffFactor: 2,
       fuzzFactor: 0.5,
-      timeout: 0,
+      timeout: 30000,
     };
   }