From 67681112ba3e15b23d9ac49d7abdf02de66396f5 Mon Sep 17 00:00:00 2001 From: Shane Myrick Date: Fri, 19 Aug 2022 14:42:32 -0700 Subject: [PATCH] Rebase from main --- .changeset/lemon-goats-happen.md | 5 ----- CHANGELOG.md | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 .changeset/lemon-goats-happen.md diff --git a/.changeset/lemon-goats-happen.md b/.changeset/lemon-goats-happen.md deleted file mode 100644 index f21d3a536fb..00000000000 --- a/.changeset/lemon-goats-happen.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"apollo-datasource-rest": patch ---- - -Add option to disable RESTDatasource GET cache diff --git a/CHANGELOG.md b/CHANGELOG.md index 16335c65314..b7b1905755d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ The version headers in this history reflect the versions of Apollo Server itself ## vNEXT +- [apollo-datasource-rest] Add option to disable GET cache [PR #6650](https://github.com/apollographql/apollo-server/pull/6650) + ## v3.10.1 - ⚠️ **SECURITY**: The default landing page contained HTML to display a sample `curl` command which is made visible if the full landing page bundle could not be fetched from Apollo's CDN. The server's URL is directly interpolated into this command inside the browser from `window.location.href`. On some older browsers such as IE11, this value is not URI-encoded. On such browsers, opening a malicious URL pointing at an Apollo Router could cause execution of attacker-controlled JavaScript. In this release, the fallback page does not display a `curl` command. More details are available at the [security advisory](https://github.com/apollographql/apollo-server/security/advisories/GHSA-2fvv-qxrq-7jq6).