Merge pull request fideloper#99 from taylorotwell/patch-1

Merge configuration if configuration isn't cached.
paulredmond · Dec 19, 2017 · 407d885 · 407d885
2 parents 3f41fb3 + 25b8c3e
commit 407d885
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/TrustedProxyServiceProvider.php b/src/TrustedProxyServiceProvider.php
@@ -23,7 +23,10 @@ public function boot()
             $this->app->configure('trustedproxy');
         }
 
-        $this->mergeConfigFrom($source, 'trustedproxy');
+
+        if ($this->app instanceof LaravelApplication && ! $this->app->configurationIsCached()) {
+            $this->mergeConfigFrom($source, 'trustedproxy');
+        }
     }
 
     /**