From 8ab4faad8a47d0e4d1db9ff6b07e6d6bf8703490 Mon Sep 17 00:00:00 2001 From: Jakob Schrettenbrunner Date: Wed, 1 Feb 2017 20:31:24 +0100 Subject: [PATCH] remove TRUSTED_PROXIES from .env.example make style ci happy --- .env.example | 1 - app/Http/Kernel.php | 2 +- config/trustedproxy.php | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 7e41a75a0..ba98b1c75 100644 --- a/.env.example +++ b/.env.example @@ -7,7 +7,6 @@ APP_CLEAR_TASKLOG=720 APP_DELETE_MINUTES=10 CONSOLE_PUSH_FREQ=250 CONSOLE_PUSH_COUNT=10 -TRUSTED_PROXIES=null DB_HOST=localhost DB_PORT=3306 diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 7e03c17ec..d4c1cf1f1 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -17,7 +17,7 @@ class Kernel extends HttpKernel \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Session\Middleware\StartSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, - + \Pterodactyl\Http\Middleware\LanguageMiddleware::class, \Fideloper\Proxy\TrustProxies::class, ]; diff --git a/config/trustedproxy.php b/config/trustedproxy.php index 7d7accf0e..2bf4cd02f 100644 --- a/config/trustedproxy.php +++ b/config/trustedproxy.php @@ -30,13 +30,13 @@ return [ * Or, to trust all proxies that connect * directly to your server, uncomment this: */ - # 'proxies' => '*', + // 'proxies' => '*', /* * Or, to trust ALL proxies, including those that * are in a chain of fowarding, uncomment this: - */ - # 'proxies' => '**', + */ + // 'proxies' => '**', /* * Default Header Names @@ -55,5 +55,5 @@ return [ \Illuminate\Http\Request::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST', \Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO', \Illuminate\Http\Request::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT', - ] + ], ];