Skip to content

Commit

Permalink
Bring back check for X-Forwarded-For (#3036)
Browse files Browse the repository at this point in the history
Reverts dc9ac62
  • Loading branch information
brandonkelly committed Jul 30, 2018
1 parent 7d4c6d2 commit 97e2998
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Dynamic app component configs are now defined by methods on `craft\helpers\App`, making it easier to modify them from `config/app.php`. ([#3152](https://github.com/craftcms/cms/issues/3152))
- Structure operations now ensure that no other operations are being performed on the same structure, reducing the risk of corrupting the structure. ([#3148](https://github.com/craftcms/cms/issues/3148))
- The `{% js %}` tag now supports the following position params: `at POS_HEAD`, `at POS_BEGIN`, `at POS_END`, `on POS_READY`, and `on POS_LOAD` (e.g. `{% js at POS_END %}`).
- Craft once again checks for `X-Forwarded-For` headers when determining the user’s IP. ([#3036](https://github.com/craftcms/cms/issues/3036))

### Deprecated
- Deprecated `craft\db\Connection::createFromConfig()`. `craft\helpers\App::dbConfig()` should be used instead.
Expand Down
1 change: 1 addition & 0 deletions src/web/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class Request extends \yii\web\Request
*/
public $ipHeaders = [
'Client-IP',
'X-Forwarded-For',
'X-Forwarded',
'X-Cluster-Client-IP',
'Forwarded-For',
Expand Down

0 comments on commit 97e2998

Please sign in to comment.