From ccca3170d3ce376fe0825b104dba2ce65d8b6a36 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Thu, 17 Jan 2019 12:08:19 +0200
Subject: [PATCH] Fixed HTTP codes for non-standard response codes becoming 500
 server errors

---
 system/src/Grav/Common/Grav.php                      | 2 +-
 system/src/Grav/Common/Processors/TasksProcessor.php | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index b37fce625..92b9649c7 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -338,7 +338,7 @@ class Grav extends Container
             $response = new Response($page->httpResponseCode(), $page->httpHeaders(), '');
         }
 
-        http_response_code($response->getStatusCode());
+        header("HTTP/{$response->getProtocolVersion()} {$response->getStatusCode()} {$response->getReasonPhrase()}");
         foreach ($response->getHeaders() as $key => $values) {
             foreach ($values as $i => $value) {
                 header($key . ': ' . $value, $i === 0);
diff --git a/system/src/Grav/Common/Processors/TasksProcessor.php b/system/src/Grav/Common/Processors/TasksProcessor.php
index 3e6e7c656..42383c315 100644
--- a/system/src/Grav/Common/Processors/TasksProcessor.php
+++ b/system/src/Grav/Common/Processors/TasksProcessor.php
@@ -35,9 +35,15 @@ class TasksProcessor extends ProcessorBase
                 try {
                     $response = $controller->handle($request);
 
+                    if ($response->getStatusCode() === 418) {
+                        //print_r($response);die();
+                        //$response = $handler->handle($request);
+                    }
+
                     $this->stopTimer();
 
                     return $response;
+
                 } catch (NotFoundException $e) {
                     // Task not found: Let it pass through.
                 }