From 60768b488564a21b0d8bc54578ad718128ba750b Mon Sep 17 00:00:00 2001 From: somini Date: Sun, 1 Dec 2019 10:13:57 +0000 Subject: [PATCH] [DisplayAction] Don't return redirect error codes (#1359) This might lead to redirect loops. See https://github.com/RSS-Bridge/rss-bridge/pull/1071#issuecomment-515632848 Cherry-picked from eb21d6f. --- actions/DisplayAction.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/actions/DisplayAction.php b/actions/DisplayAction.php index fc5e9da0..89930cfb 100644 --- a/actions/DisplayAction.php +++ b/actions/DisplayAction.php @@ -12,6 +12,15 @@ */ class DisplayAction extends ActionAbstract { + private function get_return_code($error) { + $returnCode = $error->getCode(); + if ($returnCode === 301 || $returnCode === 302) { + # Don't pass redirect codes to the exterior + $returnCode = 508; + } + return $returnCode; + } + public function execute() { $bridge = array_key_exists('bridge', $this->userData) ? $this->userData['bridge'] : null; @@ -181,7 +190,7 @@ class DisplayAction extends ActionAbstract { $items[] = $item; } elseif(Configuration::getConfig('error', 'output') === 'http') { - header('Content-Type: text/html', true, $e->getCode()); + header('Content-Type: text/html', true, get_return_code($e)); die(buildTransformException($e, $bridge)); } } @@ -213,7 +222,7 @@ class DisplayAction extends ActionAbstract { $items[] = $item; } elseif(Configuration::getConfig('error', 'output') === 'http') { - header('Content-Type: text/html', true, $e->getCode()); + header('Content-Type: text/html', true, get_return_code($e)); die(buildTransformException($e, $bridge)); } }