diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-30 12:47:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 12:47:56 +0200 |
| commit | 9f6194d00034f0bd67d2b8c97fd26586d2a7a9ed (patch) | |
| tree | 7512b05f873bcfe8d0f79c34370d0bebad70a07f /dom/ipc/ContentParent.h | |
| parent | 6e8846622a79549542adaca58d741d9263daf686 (diff) | |
| parent | bd851735628cd6b07285e87fa60081e9d11a3b7e (diff) | |
| download | UXP-9f6194d00034f0bd67d2b8c97fd26586d2a7a9ed.tar UXP-9f6194d00034f0bd67d2b8c97fd26586d2a7a9ed.tar.gz UXP-9f6194d00034f0bd67d2b8c97fd26586d2a7a9ed.tar.lz UXP-9f6194d00034f0bd67d2b8c97fd26586d2a7a9ed.tar.xz UXP-9f6194d00034f0bd67d2b8c97fd26586d2a7a9ed.zip | |
Merge pull request #412 from g4jc/hsts_priming_removal_backport
Remove support and tests for HSTS priming from the tree. Fixes #384
Diffstat (limited to 'dom/ipc/ContentParent.h')
| -rw-r--r-- | dom/ipc/ContentParent.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h index f1719c059..abcea0b65 100644 --- a/dom/ipc/ContentParent.h +++ b/dom/ipc/ContentParent.h @@ -742,8 +742,7 @@ private: const uint32_t& aFlags, bool* aIsSecureURI) override; virtual bool RecvAccumulateMixedContentHSTS(const URIParams& aURI, - const bool& aActive, - const bool& aHSTSPriming) override; + const bool& aActive) override; virtual bool DeallocPHalParent(PHalParent*) override; |