From cb6e8a4eaad72a824e12fb1323964dd3b369cb4d Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Thu, 16 Jan 2020 12:14:05 -0600
Subject: [PATCH 1/3] Don't always explode the TRUST_PROXIES variable

---
 config/trustedproxy.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/trustedproxy.php b/config/trustedproxy.php
index 0a0776ada..1ab2b0926 100644
--- a/config/trustedproxy.php
+++ b/config/trustedproxy.php
@@ -1,5 +1,13 @@
 <?php
 
+$proxyString = env('TRUST_PROXIES', '');
+
+if ($proxyString == '*' || $proxyString == '**') {
+    $proxies = $proxyString;
+} else {
+    $proxies = explode(',', $proxyString);
+}
+
 return [
     /*
      * Set trusted proxy IP addresses.
@@ -23,5 +31,5 @@ return [
      * how many proxies that client's request has
      * subsequently passed through.
      */
-    'proxies' => explode(',', env('TRUST_PROXIES', '')),
+    'proxies' => $proxies,
 ];

From 64af65e992f2f7d15ddeb91521772546b298e5b3 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Thu, 16 Jan 2020 23:34:10 -0600
Subject: [PATCH 2/3] TrustProxies natively supports , strings

---
 config/trustedproxy.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/config/trustedproxy.php b/config/trustedproxy.php
index 1ab2b0926..608e189d5 100644
--- a/config/trustedproxy.php
+++ b/config/trustedproxy.php
@@ -1,13 +1,5 @@
 <?php
 
-$proxyString = env('TRUST_PROXIES', '');
-
-if ($proxyString == '*' || $proxyString == '**') {
-    $proxies = $proxyString;
-} else {
-    $proxies = explode(',', $proxyString);
-}
-
 return [
     /*
      * Set trusted proxy IP addresses.
@@ -31,5 +23,5 @@ return [
      * how many proxies that client's request has
      * subsequently passed through.
      */
-    'proxies' => $proxies,
+    'proxies' => env('TRUST_PROXIES', ''),
 ];

From be75a19260bfe2fa9f314db6a2de5729a5213141 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 16 Jan 2020 22:37:35 -0700
Subject: [PATCH 3/3] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1304fcd21..bb1bf682c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 ### Fixed
 - Fixed Story Compose bug affecting postgres instances ([#1918](https://github.com/pixelfed/pixelfed/pull/1918))
 - Fixed header background bug on MomentUI profiles ([#1933](https://github.com/pixelfed/pixelfed/pull/1933))
+- Fixed TRUST_PROXIES configuration ([#1941](https://github.com/pixelfed/pixelfed/pull/1941))
 
 
 ### Changed