From f66e0b39c817da2ee18a7f74b77f317ccccf01d9 Mon Sep 17 00:00:00 2001
From: Matthew Finkel <sysrqb@torproject.org>
Date: Thu, 5 Nov 2020 01:39:20 +0000
Subject: [PATCH] Revert "Merge remote-tracking branch 'acatgl/34439' into
android-components-60.0.5-10.0-1"
This reverts commit 8dff84319a18189e6b4bcca5ce78beed9aba984b, reversing
changes made to c2d4d9840a0f8e789e091bc693d01f2995fb5fc5.
---
.../browser/engine/gecko/fetch/GeckoViewFetchClient.kt | 1 -
.../mozilla/components/browser/icons/loader/HttpIconLoader.kt | 3 +--
.../src/main/java/mozilla/components/concept/fetch/Request.kt | 3 +--
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt b/components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
index b10480753b..ca4157ca86 100644
--- a/components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
+++ b/components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
@@ -80,7 +80,6 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url)
.addHeadersFrom(this)
.addBodyFrom(this)
.cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD)
- .origin(origin)
.build()
private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder {
diff --git a/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt b/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt
index a6710b4f8b..bd9e714fb8 100644
--- a/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt
+++ b/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt
@@ -51,8 +51,7 @@ class HttpIconLoader(
connectTimeout = Pair(CONNECT_TIMEOUT, TimeUnit.SECONDS),
readTimeout = Pair(READ_TIMEOUT, TimeUnit.SECONDS),
redirect = Request.Redirect.FOLLOW,
- useCaches = true,
- origin = request.url)
+ useCaches = true)
return try {
val response = httpClient.fetch(downloadRequest)
diff --git a/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt b/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt
index 8d6a263552..d565273950 100644
--- a/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt
+++ b/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt
@@ -46,8 +46,7 @@ data class Request(
val body: Body? = null,
val redirect: Redirect = Redirect.FOLLOW,
val cookiePolicy: CookiePolicy = CookiePolicy.INCLUDE,
- val useCaches: Boolean = true,
- val origin: String? = null
+ val useCaches: Boolean = true
) {
/**
* A [Body] to be send with the [Request].
--
GitLab