Skip to content

Commit

Permalink
Merge pull request #187 from gsteel/doc-lint-fixes
Browse files Browse the repository at this point in the history
Fix linting issues in docs
  • Loading branch information
gsteel committed Mar 15, 2024
2 parents a4e34af + cdc520a commit e5f1a49
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
16 changes: 8 additions & 8 deletions docs/book/v2/migration.md
Expand Up @@ -13,17 +13,17 @@ options for doing so:

- Update your constraint to allow either version:

- Edit the constraint in your `composer.json` to read:
- Edit the constraint in your `composer.json` to read:

```json
"laminas/laminas-diactoros": "^1.8.6 || ^2.0"
```
```json
"laminas/laminas-diactoros": "^1.8.6 || ^2.0"
```

- Update your dependencies:
- Update your dependencies:

```bash
$ composer update
```
```bash
$ composer update
```

The first approach may fail if libraries you depend on specifically require a
version 1 release. The second approach may leave you on a version 1 release in
Expand Down
14 changes: 7 additions & 7 deletions docs/book/v2/server-request-filters.md
Expand Up @@ -55,13 +55,13 @@ These named constructors are:
It is functionally equivalent to `FilterUsingXForwardedHeaders::trustProxies(['*'])`.
- `FilterUsingXForwardedHeaders::trustReservedSubnets(): void`: when this method is called, the filter will trust requests made from reserved, private subnets.
It is functionally equivalent to `FilterUsingXForwardedHeaders::trustProxies()` with the following elements in the `$proxyCIDRList`:
- 10.0.0.0/8
- 127.0.0.0/8
- 172.16.0.0/12
- 192.168.0.0/16
- ::1/128 (IPv6 localhost)
- fc00::/7 (IPv6 private networks)
- fe80::/10 (IPv6 local-link addresses)
- 10.0.0.0/8
- 127.0.0.0/8
- 172.16.0.0/12
- 192.168.0.0/16
- ::1/128 (IPv6 localhost)
- fc00::/7 (IPv6 private networks)
- fe80::/10 (IPv6 local-link addresses)

Internally, the filter checks the `REMOTE_ADDR` server parameter (as retrieved from `getServerParams()`) and compares it against each proxy listed; the first to match indicates trust.

Expand Down
14 changes: 7 additions & 7 deletions docs/book/v3/server-request-filters.md
Expand Up @@ -55,13 +55,13 @@ These named constructors are:
It is functionally equivalent to `FilterUsingXForwardedHeaders::trustProxies(['*'])`.
- `FilterUsingXForwardedHeaders::trustReservedSubnets(): void`: when this method is called, the filter will trust requests made from reserved, private subnets.
It is functionally equivalent to `FilterUsingXForwardedHeaders::trustProxies()` with the following elements in the `$proxyCIDRList`:
- 10.0.0.0/8
- 127.0.0.0/8
- 172.16.0.0/12
- 192.168.0.0/16
- ::1/128 (IPv6 localhost)
- fc00::/7 (IPv6 private networks)
- fe80::/10 (IPv6 local-link addresses)
- 10.0.0.0/8
- 127.0.0.0/8
- 172.16.0.0/12
- 192.168.0.0/16
- ::1/128 (IPv6 localhost)
- fc00::/7 (IPv6 private networks)
- fe80::/10 (IPv6 local-link addresses)

Internally, the filter checks the `REMOTE_ADDR` server parameter (as retrieved from `getServerParams()`) and compares it against each proxy listed; the first to match indicates trust.

Expand Down

0 comments on commit e5f1a49

Please sign in to comment.