Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Fix #3358 - Update httpse data files #3402

Merged
merged 1 commit into from
Mar 24, 2021
Merged

Conversation

jumde
Copy link
Contributor

@jumde jumde commented Mar 11, 2021

Summary of Changes

This pull request fixes #3358

Submitter Checklist:

  • Unit Tests are updated to cover new or changed functionality
  • User-facing strings use NSLocalizableString()

Test Plan:

  1. Navigate to radio.garden and verify the site loads without any redirect loops
  2. Navigate to httpse-everywhere.badssl.com and verify that HTTPS Everywhere is working

Screenshots:

Reviewer Checklist:

  • Issues include necessary QA labels:
    • QA/(Yes|No)
    • release-notes/(include|exclude)
    • bug / enhancement
  • Necessary security reviews have taken place.
  • Adequate unit test coverage exists to prevent regressions.
  • Adequate test plan exists for QA to validate (if applicable).
  • Issue is assigned to a milestone (should happen at merge time).

@jumde jumde self-assigned this Mar 11, 2021
@@ -336,6 +336,7 @@ class BrowserViewController: UIViewController {
}
Preferences.NewTabPage.selectedCustomTheme.observe(from: self)
// Lists need to be compiled before attempting tab restoration
ContentBlockerHelper.clearBlockingRules()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kylehickinson worked on this more, I will leave this part to him,
if you want me to take over and look closer at it, let me know Kyle

@@ -336,6 +336,7 @@ class BrowserViewController: UIViewController {
}
Preferences.NewTabPage.selectedCustomTheme.observe(from: self)
// Lists need to be compiled before attempting tab restoration
ContentBlockerHelper.clearBlockingRules()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jumde to fix potential race condition around not waiting for removeContentRuleList completion handler

@jumde jumde force-pushed the update-httpse branch 4 times, most recently from 3708e4a to c446d99 Compare March 12, 2021 03:02
@jumde jumde mentioned this pull request Mar 12, 2021
@kylehickinson kylehickinson added this to the 1.25 milestone Mar 12, 2021
@kylehickinson kylehickinson merged commit 74a539d into development Mar 24, 2021
@kylehickinson kylehickinson deleted the update-httpse branch March 24, 2021 15:22
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update httpse data files
4 participants