Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '8.x' 

# Conflicts:
#	CHANGELOG.md
#	composer.json
This commit is contained in:
Dries Vints 2021-08-10 19:28:02 +02:00
parent 7f68c30179 236b31872d
commit 4d0f40f98c
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,6 +1,12 @@
# Release Notes # Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.23...master) ## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.24...master)
## [v8.5.24 (2021-08-10)](https://github.com/laravel/laravel/compare/v8.5.23...v8.5.24)
### Changed
- Use new `TrustProxies` middleware ([#5662](https://github.com/laravel/laravel/pull/5662))
## [v8.5.23 (2021-08-03)](https://github.com/laravel/laravel/compare/v8.5.22...v8.5.23) ## [v8.5.23 (2021-08-03)](https://github.com/laravel/laravel/compare/v8.5.22...v8.5.23)

2
app/Http/Middleware/TrustProxies.php
View File

@ -2,7 +2,7 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Fideloper\Proxy\TrustProxies as Middleware; use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class TrustProxies extends Middleware class TrustProxies extends Middleware

1
composer.json
View File

@ -6,7 +6,6 @@
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^8.0", "php": "^8.0",
"fideloper/proxy": "dev-master",
"fruitcake/laravel-cors": "dev-develop", "fruitcake/laravel-cors": "dev-develop",
"guzzlehttp/guzzle": "^7.0.1", "guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^9.0", "laravel/framework": "^9.0",