Skip to content

[pull] master from gorhill:master #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Oct 17, 2024
Merged

[pull] master from gorhill:master #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32f27c5
Ensure `urlskip=` redirects only to `https:`
gorhill Oct 16, 2024
e9c0ad5
Update changelog
gorhill Oct 16, 2024
e6b7f06
New revision for dev build
gorhill Oct 16, 2024
98db549
Make Firefox dev build auto-update
gorhill Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
- [Ensure `urlskip=` redirects only to `https:`](https://github.com/gorhill/uBlock/commit/32f27c5131)
- [Add support to `urlskip=` media resources](https://github.com/gorhill/uBlock/commit/ce9fc5dc14)
- [Add `-uricomponent` to `urlskip=` option](https://github.com/gorhill/uBlock/commit/01eebffc1f)
- [Add `forbidden`/`forever` as safe cookie values](https://github.com/gorhill/uBlock/commit/4d982d9972) (by @ryanbr)
Expand Down
4 changes: 2 additions & 2 deletions dist/firefox/updates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"uBlock0@raymondhill.net": {
"updates": [
{
"version": "1.60.1.13",
"version": "1.60.1.14",
"browser_specific_settings": { "gecko": { "strict_min_version": "78.0" } },
"update_link": "https://github.com/gorhill/uBlock/releases/download/1.60.1b13/uBlock0_1.60.1b13.firefox.signed.xpi"
"update_link": "https://github.com/gorhill/uBlock/releases/download/1.60.1b14/uBlock0_1.60.1b14.firefox.signed.xpi"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion dist/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.60.1.13
1.60.1.14
3 changes: 2 additions & 1 deletion src/js/static-net-filtering.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5508,7 +5508,8 @@ function urlSkip(directive, url, steps) {
// Unknown directive
return;
}
void new URL(urlout);
const urlfinal = new URL(urlout);
if ( urlfinal.protocol !== 'https:' ) { return; }
return urlout;
} catch(x) {
}
Expand Down