diff --git a/AUTHORS b/AUTHORS index 92a00cf104..398cc67213 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,8 +13,8 @@ # # Please keep the list sorted. -AdsWizz <*@adswizz.com> Adrián Gómez Llorente +AdsWizz <*@adswizz.com> Alex Jones Alugha GmbH <*@alugha.com> Alvaro Velad Galvan @@ -23,16 +23,16 @@ Anthony Stansbridge Benjamin Wallberg Bonnier Broadcasting <*@bonnierbroadcasting.com> Bryan Huh -Code It <*@code-it.fr> Charter Communications Inc <*@charter.com> +Code It <*@code-it.fr> Damien Deis Dany L'Hébreux +Edgeware AB <*@edgeware.tv> Esteban Dosztal Fadomire -Google Inc. <*@google.com> -Edgeware AB <*@edgeware.tv> Gil Gonen Giuseppe Samela +Google Inc. <*@google.com> Itay Kinnrot Jason Palmer Jesper Haug Karsrud @@ -50,6 +50,7 @@ Oskar Arvidsson Patrick Cruikshank Patrick Kunka Paul Jordaan +Pavel Zablockij Percy Tse Peter Nycander Philo Inc. <*@philo.com> @@ -71,4 +72,3 @@ uStudio Inc. <*@ustudio.com> Verizon Digital Media Services <*@verizondigitalmedia.com> Vincent Valot Wayne Morgan - diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a0ae42f25e..76fecadca5 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -31,8 +31,8 @@ Amila Sampath Andy Hochhaus Anthony Stansbridge Ashutosh Kumar Mukhiya -Benjamin Wallberg Benjamin Wallberg +Benjamin Wallberg Boris Cupac Brad Nadler Bryan Huh @@ -78,6 +78,7 @@ Oskar Arvidsson Patrick Cruikshank Patrick Kunka Paul Jordaan +Pavel Zablockij Percy Tse Peter Nycander Prakash Duggaraju @@ -107,4 +108,4 @@ Vasanth Polipelli Vignesh Venkatasubramanian Vincent Valot Wayne Morgan -Yohann Connell \ No newline at end of file +Yohann Connell diff --git a/externs/shaka/net.js b/externs/shaka/net.js index 8a70ffb978..3a7f17db65 100644 --- a/externs/shaka/net.js +++ b/externs/shaka/net.js @@ -101,6 +101,7 @@ shaka.extern.Request; * @typedef {{ * uri: string, * data: BufferSource, + * status: (number|undefined), * headers: !Object., * timeMs: (number|undefined), * fromCache: (boolean|undefined) @@ -119,6 +120,8 @@ shaka.extern.Request; * redirects, but after request filters are executed. * @property {BufferSource} data * The body of the response. + * @property {(number|undefined)} status + * The response HTTP status code. * @property {!Object.} headers * A map of response headers, if supported by the underlying protocol. * All keys should be lowercased. diff --git a/lib/net/http_plugin_utils.js b/lib/net/http_plugin_utils.js index a667c91e80..8ac471671b 100644 --- a/lib/net/http_plugin_utils.js +++ b/lib/net/http_plugin_utils.js @@ -34,6 +34,7 @@ shaka.net.HttpPluginUtils = class { uri: responseURL || uri, originalUri: uri, data: data, + status: status, headers: headers, fromCache: !!headers['x-shaka-from-cache'], };