Skip to content
This repository has been archived by the owner on Sep 9, 2022. It is now read-only.

Commit

Permalink
Performance and memory related changes
Browse files Browse the repository at this point in the history
1. Special treatment for hostname-anchored (`||`) filters having wildcard characters. These filters are categorized into three types. The purpose is to convert regex based filter internally into plain string based filters.
	- Filters having a single occurrence of pattern `^*` after the hostname and no other wildcard character on another side of this pattern.
		||*.cloudfront.net^*F2P_SideBar_Banner_EN.jpg
		||*2mdn.net^*/1x1image.jpg$image
		||2mdn.*^*/1x1image.jpg$image
	- Filters having a single occurrence of wildcard character `*` after the hostname and no other wildcard character on another side of it.
		||*.cloudfront.net/wp-content/*F2P_SideBar_Banner_EN.jpg
		||cloudfront.net/wp-content/*F2P_SideBar_Banner_EN.jpg
		||www.google.*/aclk?*^/am=&adurl=
		||i.com.com/wp-content/*F2P_SideBar_Banner_EN.jpg
	-	Other filters
		||cloud*.net^$third-party
		@@||doubleclick.net/adi/mlb.mlb/*^free_agent_tracker_12^$subdocument,domain=mlb.com
2. Now hostname-anchored (`||`) filters matches hostname in URL accurately.
	||*-aaa.net^$third-party
3. Filters having a single occurrence of wildcard character `*` converted internally into plain string based filters.
	@@/cdn-cgi/pe/bag2?*googleadservices.com%2Fpagead%2Fconversion.js$xmlhttprequest,domain=ethica.net.au|factom.org|gogoonhold.com.au
	/cdn-cgi/pe/bag2?r*.qualitypublishers.com
4. Using singleton object in case of any match URL filter.
	$script,third-party,domain=0dt.net|123videos.tv
5. Ignore token if it is preceded by `*` characters in Token generate logic
  • Loading branch information
uBlockAdmin committed Jul 2, 2019
1 parent d996541 commit d1e1ca1
Show file tree
Hide file tree
Showing 4 changed files with 349 additions and 59 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Being lean and efficient doesn't mean blocking less<br>

* It's important to note that blocking ads [is *not* theft](https://twitter.com/LeaVerou/status/518154828166725632). Don't fall for this creepy idea. The _ultimate_ logical consequence of `blocking = theft` is the criminalisation of the inalienable right to privacy.

* _EasyList_, _Peter Lowe's Adservers_, _EasyPrivacy_ and _Malware domains_ are enabled by default when you install uBlock. Many more lists are readily available to block trackers, analytics, and more. Hosts files are also supported.
* _EasyList_, _Acceptable Ads_, _ABP Anti-Circumvention Filter List‎_ and _Cryptocurrency (Bitcoin) Mining Protection List‎_ are enabled by default when you install uBlock. Many more lists are readily available to block trackers, analytics, and more. Hosts files are also supported.

* Once you install uBlock, you can easily un-select any of the pre-selected filter lists if you think uBlock blocks too much. For reference, Adblock Plus installs with only _EasyList_ enabled by default.

Expand Down
2 changes: 1 addition & 1 deletion platform/chromium/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 2,

"name": "uBlock",
"version": "0.9.5.16",
"version": "0.9.5.17",

"default_locale": "en",
"description": "__MSG_extShortDesc__",
Expand Down
4 changes: 2 additions & 2 deletions src/js/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ return {

// read-only
systemSettings: {
compiledMagic: 'krpszukpsddd',
selfieMagic: 'ednhiasrsddd'
compiledMagic: 'wertpszukpsddd',
selfieMagic: 'werthiasrsddd'
},
restoreBackupSettings: {
lastRestoreFile: '',
Expand Down
Loading

0 comments on commit d1e1ca1

Please sign in to comment.