Skip to content

Commit 2217842

Browse files
authored
Merge pull request #844 from AdguardTeam/fix-http-urls
replace http:// with https://
2 parents cc4d7d0 + 635815b commit 2217842

12 files changed

Lines changed: 42 additions & 42 deletions

File tree

docs/adguard-for-android/solving-problems/har.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ HAR files are processed in accordance with [the AdGuard Privacy Policy](https://
1717

1818
## What are HAR files?
1919

20-
The HAR (HTTP ARchive) format is a JSON-formatted archive file for logging of a web browser's interaction with a site. The specifications of HAR format define archival data for HTTP transactions that a browser uses to export detailed information about the web pages it loads. More detailed description of HAR file format and its specification you can find at [softwareishard.com](http://www.softwareishard.com/blog/har-12-spec/) website.
20+
The HAR (HTTP ARchive) format is a JSON-formatted archive file for logging of a web browser's interaction with a site. The specifications of HAR format define archival data for HTTP transactions that a browser uses to export detailed information about the web pages it loads. More detailed description of HAR file format and its specification you can find at [softwareishard.com](https://www.softwareishard.com/blog/har-12-spec/) website.
2121

2222
## How to generate HAR files
2323

docs/adguard-for-mac/features/network.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ You can set up AdGuard to route all your device’s traffic through your proxy s
3333

3434
You can use AdGuard as an HTTP proxy server. This will allow you to filter traffic on other devices connected to the proxy.
3535

36-
Make sure your Mac and your other device are connected to the same network and enter the proxy port on the device you want to route through your proxy server (usually in the network settings). To filter HTTPS traffic as well, [transfer AdGuard’s proxy certificate](http://local.adguard.org/cert) to this device. [Learn more about installing a proxy certificate](/guides/proxy-certificate)
36+
Make sure your Mac and your other device are connected to the same network and enter the proxy port on the device you want to route through your proxy server (usually in the network settings). To filter HTTPS traffic as well, [transfer AdGuard’s proxy certificate](https://local.adguard.org/cert) to this device. [Learn more about installing a proxy certificate](/guides/proxy-certificate)

docs/adguard-for-mac/solving-problems/manual-certificate-installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ To manually install the certificate into Firefox-like browser:
2121

2222
4. Navigate to the *Authorities* tab and click the *Import...* button
2323

24-
5. Select file `/Library/Application Support/AdGuard Software/com.adguard.mac.adguard/AdguardCore/Adguard Personal CA.cer` or just download it from http://local.adguard.org/cert using a Chromium-based browser (e.g Google Chrome or new Edge) and with a HTTPS-filtering running in AdGuard
24+
5. Select file `/Library/Application Support/AdGuard Software/com.adguard.mac.adguard/AdguardCore/Adguard Personal CA.cer` or just download it from https://local.adguard.org/cert using a Chromium-based browser (e.g Google Chrome or new Edge) and with a HTTPS-filtering running in AdGuard
2525

2626
Exact actions required for different Gecko-based browsers may vary, but the general sequence and the path to `AdGuard Personal CA.cer` file will be the same.

docs/adguard-for-windows/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This article covers AdGuard for Windows, a multifunctional ad blocker that prote
2323

2424
To install AdGuard on a Windows PC or tablet, follow these steps:
2525

26-
1. Go to the [AdGuard website](http://adguard.com) and click *Download*. You can also get the installation program from the [download page](https://adguard.com/download.html?auto=1) — the download will start automatically.
26+
1. Go to the [AdGuard website](https://adguard.com) and click *Download*. You can also get the installation program from the [download page](https://adguard.com/download.html?auto=1) — the download will start automatically.
2727

2828
![Download AdGuard *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/installation_new/website_en.png)
2929

docs/adguard-for-windows/solving-problems/common-installer-errors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ These are two different errors with very similar solutions. As their titles sugg
2727

2828
- Uninstall some programs or delete unnecessary files from the drive you were trying to install AdGuard to.
2929

30-
- Download, install, and run [AdwCleaner](http://www.bleepingcomputer.com/download/adwcleaner/), a free piece of software by Malwarebytes. It will, among other things, clean your system from all kinds of extra "leftover" files that remain after incorrectly uninstalled programs and such. It will help clean up some disk space.
30+
- Download, install, and run [AdwCleaner](https://www.bleepingcomputer.com/download/adwcleaner/), a free piece of software by Malwarebytes. It will, among other things, clean your system from all kinds of extra "leftover" files that remain after incorrectly uninstalled programs and such. It will help clean up some disk space.
3131

3232
- Reboot your computer. Sometimes temporary files can take up a considerable amount of disk space, and restarting your PC is the most reliable way to get rid of them.
3333

docs/adguard-for-windows/solving-problems/connection-not-trusted.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ If that doesn't help, follow the instructions for manually adding the AdGuard ce
3333
3434
1. Run AdGuard.
3535

36-
1. Go to [http://local.adguard.org/cert](http://local.adguard.org/cert) and click the *Download* button. The browser should start downloading **cert.cer** file.
36+
1. Go to [https://local.adguard.org/cert](https://local.adguard.org/cert) and click the *Download* button. The browser should start downloading **cert.cer** file.
3737

3838
:::note
3939

docs/general/ad-filtering/create-own-filters.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ For example:
4242

4343
**This rule blocks:**
4444

45-
- `http://example.org/ad1.gif`
46-
- `http://subdomain.example.org/ad1.gif`
45+
- `https://example.org/ad1.gif`
46+
- `https://subdomain.example.org/ad1.gif`
4747
- `https://ads.example.org:8000/`
4848

4949
**This rule does not block:**
5050

51-
- `http://ads.example.org.us/ad1.gif`
52-
- `http://example.com/redirect/http://ads.example.org/`
51+
- `https://ads.example.org.us/ad1.gif`
52+
- `https://example.com/redirect/https://ads.example.org/`
5353

5454
By default, such rules do not work for document requests. This means that the `||example.org^` rule will block a request made to `example.org` when you try to navigate to this domain from another website, but if you type `example.org` into the address bar and try to navigate to it, the website will open. To block the document request, you will need to use a rule with the [`$document` modifier](#document-modifier): `||example.org^$document`.
5555

@@ -59,7 +59,7 @@ By default, such rules do not work for document requests. This means that the `|
5959

6060
**This rule blocks:**
6161

62-
- `http://example.org/`
62+
- `https://example.org/`
6363

6464
**This rule does not block:**
6565

@@ -73,7 +73,7 @@ Filtering rules support numerous modifiers that allow you to fine-tune the rule
7373

7474
**This rule blocks:**
7575

76-
- `http://example.org/script.js` if this script is loaded from `example.com`.
76+
- `https://example.org/script.js` if this script is loaded from `example.com`.
7777

7878
**This rule does not block:**
7979

@@ -86,7 +86,7 @@ Filtering rules support numerous modifiers that allow you to fine-tune the rule
8686

8787
**This rule unblocks:**
8888

89-
- `http://example.org/banner.png` even if there is a blocking rule for this address.
89+
- `https://example.org/banner.png` even if there is a blocking rule for this address.
9090

9191
Blocking rules with [`$important`](#important-modifier) modifier can override exceptions.
9292

@@ -116,8 +116,8 @@ AdGuard [extends CSS](#extended-css-selectors) and lets filters developers handl
116116
| Attribute selector | `div[class="banners"]` | Matches all `div` elements with `class` attribute **exactly equal** to `banners`.<br/>![Attribute selector](https://cdn.adtidy.org/public/Adguard/kb/en/rules_syntax/css_class_attr.png) |
117117
| Attribute substring selector | `div[class^="advert1"]` | Matches all `div` elements which `class` attribute **starts with** the `advert1` string.<br/>![Attribute substring selector](https://cdn.adtidy.org/public/Adguard/kb/en/rules_syntax/css_class_attr_start.png) |
118118
| Attribute substring selector | `div[class$="banners_ads"]` | Matches all `div` elements which `class` attribute **ends with** the `banners_ads` string.<br/>![Attribute substring selector](https://cdn.adtidy.org/public/Adguard/kb/en/rules_syntax/css_class_attr_end.png) |
119-
| Attribute substring selector | `a[href^="http://example.com/"]` | Matches all links that are loaded from `http://example.com/` domain.<br/>![Attribute substring selector](https://cdn.adtidy.org/public/Adguard/kb/en/rules_syntax/css_attr_start.png) |
120-
| Attribute selector | `a[href="http://example.com/"]` | Matches all links to **exactly** the `http://example.com/` address.<br/>![Attribute selector](https://cdn.adtidy.org/public/Adguard/kb/en/rules_syntax/css_attr_equal.png) |
119+
| Attribute substring selector | `a[href^="https://example.com/"]` | Matches all links that are loaded from `https://example.com/` domain.<br/>![Attribute substring selector](https://cdn.adtidy.org/public/Adguard/kb/en/rules_syntax/css_attr_start.png) |
120+
| Attribute selector | `a[href="https://example.com/"]` | Matches all links to **exactly** the `https://example.com/` address.<br/>![Attribute selector](https://cdn.adtidy.org/public/Adguard/kb/en/rules_syntax/css_attr_equal.png) |
121121

122122
## Restrictions and limitations
123123

@@ -301,9 +301,9 @@ modifiers = [modifier0, modifier1[, ...[, modifierN]]]
301301
### Special characters {#basic-rules-special-characters}
302302

303303
- **`*`** — a wildcard character. It is used to represent any set of characters. This can also be an empty string or a string of any length.
304-
- **`||`** — an indication to apply the rule to the specified domain and its subdomains. With this character, you do not have to specify a particular protocol and subdomain in address mask. It means that `||` stands for `http://*.`, `https://*.`, `ws://*.`, `wss://*.` at once.
304+
- **`||`** — an indication to apply the rule to the specified domain and its subdomains. With this character, you do not have to specify a particular protocol and subdomain in address mask. It means that `||` stands for `https://*.`, `https://*.`, `ws://*.`, `wss://*.` at once.
305305
- **`^`** — a separator character mark. Separator character is any character, but a letter, a digit, or one of the following: `_` `-` `.` `%`. In this example separator characters are shown in bold: `http:`**`//`**`example.com`**`/?`**`t=1`**`&`**`t2=t3`. The end of the address is also accepted as separator.
306-
- **`|`** — a pointer to the beginning or the end of address. The value depends on the character placement in the mask. For example, a rule `swf|` corresponds to `http://example.com/annoyingflash.swf` , but not to `http://example.com/swf/index.html`. `|http://example.org` corresponds to `http://example.org`, but not to `http://domain.com?url=http://example.org`.
306+
- **`|`** — a pointer to the beginning or the end of address. The value depends on the character placement in the mask. For example, a rule `swf|` corresponds to `https://example.com/annoyingflash.swf` , but not to `https://example.com/swf/index.html`. `|https://example.org` corresponds to `https://example.org`, but not to `https://domain.com?url=https://example.org`.
307307

308308
:::note
309309

@@ -359,7 +359,7 @@ Rules with wildcard for TLD are not supported by AdGuard Content Blocker.
359359

360360
### Basic rule examples
361361

362-
- `||example.com/ads/*` — a simple rule, which corresponds to addresses like `http://example.com/ads/banner.jpg` and even `http://subdomain.example.com/ads/otherbanner.jpg`.
362+
- `||example.com/ads/*` — a simple rule, which corresponds to addresses like `https://example.com/ads/banner.jpg` and even `https://subdomain.example.com/ads/otherbanner.jpg`.
363363

364364
- `||example.org^$third-party` — this rule blocks third-party requests to `example.org` and its subdomains.
365365

@@ -575,7 +575,7 @@ These modifiers will not be applied if the referrer matches a rule with `$domain
575575
- `*$cookie,domain=example.org|example.com` will block cookies for all requests to and from `example.org` and `example.com`.
576576
- `*$document,domain=example.org|example.com` will block requests only from `example.org` and `example.com`, but not to them.
577577

578-
In the following examples it is implied that requests are sent from `http://example.org/page` (the referrer) and the target URL is `http://targetdomain.com/page`.
578+
In the following examples it is implied that requests are sent from `https://example.org/page` (the referrer) and the target URL is `https://targetdomain.com/page`.
579579

580580
- `page$domain=example.org` will be matched, as it matches the referrer domain.
581581
- `page$domain=targetdomain.com` will not be matched because it does not match the referrer domain.
@@ -683,7 +683,7 @@ This modifier defines a rule which applies only to addresses that match the case
683683

684684
**Examples**
685685

686-
- `*/BannerAd.gif$match-case` — this rule will block `http://example.com/BannerAd.gif`, but not `http://example.com/bannerad.gif`.
686+
- `*/BannerAd.gif$match-case` — this rule will block `https://example.com/BannerAd.gif`, but not `https://example.com/bannerad.gif`.
687687

688688
:::info Compatibility
689689

@@ -727,7 +727,7 @@ AdGuard will try to close the browser tab with any address that matches a blocki
727727

728728
**Examples**
729729

730-
- `||domain.com^$popup` — if you try to go to `http://domain.com/` from any page in the browser, a new tab in which specified site has to be opened will be closed by this rule.
730+
- `||domain.com^$popup` — if you try to go to `https://domain.com/` from any page in the browser, a new tab in which specified site has to be opened will be closed by this rule.
731731

732732
##### `$popup` modifier limitations {#popup-modifier-limitations}
733733

@@ -763,7 +763,7 @@ Requests without a referrer are also treated as first-party requests, and the ru
763763

764764
**Examples**
765765

766-
- domain.com$strict-first-party' — this rule applies only to `domain.com`. For example, a request from `domain.com` to `http://domain.com/icon.ico` is a first-party request. A request from `sub.domain.com` to `http://domain.com/icon.ico` is treated as a third-party one (as opposed to the `$~third-party` modifier).
766+
- domain.com$strict-first-party' — this rule applies only to `domain.com`. For example, a request from `domain.com` to `https://domain.com/icon.ico` is a first-party request. A request from `sub.domain.com` to `https://domain.com/icon.ico` is treated as a third-party one (as opposed to the `$~third-party` modifier).
767767

768768
:::note
769769

@@ -785,7 +785,7 @@ Works the same as the [`$third-party`](#third-party-modifier) modifier but also
785785

786786
**Examples**
787787

788-
- `||domain.com^$strict-third-party` — this rule applies to all domains except `domain.com`. An example of a third-party request: `http://sub.domain.com/banner.jpg` (as opposed to the `$third-party` modifier).
788+
- `||domain.com^$strict-third-party` — this rule applies to all domains except `domain.com`. An example of a third-party request: `https://sub.domain.com/banner.jpg` (as opposed to the `$third-party` modifier).
789789

790790
:::note
791791

@@ -816,13 +816,13 @@ To be considered as such, a third-party request should meet one of the following
816816

817817
**`$third-party`:**
818818

819-
- `||domain.com^$third-party` — this rule applies to all domains except `domain.com` and its subdomains. The rule is never applied if there is no referrer. An example of a third-party request: `http://example.org/banner.jpg`.
819+
- `||domain.com^$third-party` — this rule applies to all domains except `domain.com` and its subdomains. The rule is never applied if there is no referrer. An example of a third-party request: `https://example.org/banner.jpg`.
820820

821821
If there is a `$~third-party` modifier, the rule is only applied to requests that are not from third parties. Which means they have to be sent from the same domain or shouldn't have a referrer at all.
822822

823823
**`$~third-party`:**
824824

825-
- `||domain.com$~third-party` — this rule applies only to `domain.com` and its subdomains. Example of a non third-party request: `http://sub.domain.com/icon.ico`.
825+
- `||domain.com$~third-party` — this rule applies only to `domain.com` and its subdomains. Example of a non third-party request: `https://sub.domain.com/icon.ico`.
826826

827827
Requests without a referrer are also treated as non third-party requests and the rules with the `$~third-party` modifier are applied to such requests.
828828

@@ -2635,7 +2635,7 @@ Rules with `$removeparam` modifier are intended to strip query parameters from r
26352635
26362636
**Basic syntax**
26372637
2638-
- `$removeparam=param` removes query parameter with the name `param` from URLs of any request, e.g. a request to `http://example.com/page?param=1&another=2` will be transformed into `http://example.com/page?another=2`.
2638+
- `$removeparam=param` removes query parameter with the name `param` from URLs of any request, e.g. a request to `https://example.com/page?param=1&another=2` will be transformed into `https://example.com/page?another=2`.
26392639
26402640
**Regular expressions**
26412641
@@ -2704,11 +2704,11 @@ $removeparam=/^(utm_content|utm_campaign|utm_referrer)=/
27042704
@@||example.com^$removeparam
27052705
```
27062706

2707-
With these rules some [UTM parameters](https://en.wikipedia.org/wiki/UTM_parameters) will be stripped out from any request, except that requests to `example.com` will not be stripped at all, e.g. `http://google.com/page?utm_source=s&utm_referrer=fb.com&utm_content=img` will be transformed to `http://google.com/page`, but `http://example.com/page?utm_source=s&utm_referrer=fb.com&utm_content=img` will not be affected by the blocking rule.
2707+
With these rules some [UTM parameters](https://en.wikipedia.org/wiki/UTM_parameters) will be stripped out from any request, except that requests to `example.com` will not be stripped at all, e.g. `https://google.com/page?utm_source=s&utm_referrer=fb.com&utm_content=img` will be transformed to `https://google.com/page`, but `https://example.com/page?utm_source=s&utm_referrer=fb.com&utm_content=img` will not be affected by the blocking rule.
27082708

27092709
- `$removeparam=utm_source` removes `utm_source` query parameter from all requests.
27102710

2711-
- `$removeparam=/utm_.*/` removes all `utm_* query` parameters from URL queries of any request, e.g. a request to `http://example.com/page?utm_source=test` will be transformed to `http://example.com/page`.
2711+
- `$removeparam=/utm_.*/` removes all `utm_* query` parameters from URL queries of any request, e.g. a request to `https://example.com/page?utm_source=test` will be transformed to `https://example.com/page`.
27122712

27132713
- `$removeparam=/^utm_source=campaign$/` removes `utm_source` query parameter with the value equal to `campaign`. It does not touch other `utm_source` parameters.
27142714

@@ -2846,7 +2846,7 @@ In case if multiple `$replace` rules match a single request, we will apply each
28462846
28472847
**Syntax**
28482848
2849-
In general, `$replace` syntax is similar to replacement with regular expressions [in Perl](http://perldoc.perl.org/perlrequick.html#Search-and-replace).
2849+
In general, `$replace` syntax is similar to replacement with regular expressions [in Perl](https://perldoc.perl.org/perlrequick.html#Search-and-replace).
28502850
28512851
```text
28522852
replace = "/" regexp "/" replacement "/" modifiers
@@ -2871,7 +2871,7 @@ There are three parts in this rule:
28712871
- `modifiers` — `i` for insensitive search.
28722872
28732873
You can see how this rule works here:
2874-
http://regexr.com/3cesk
2874+
https://regexr.com/3cesk
28752875
28762876
**Multiple `$replace` rules**
28772877

0 commit comments

Comments
 (0)