From 565a926bd3431fd1f76e0aca533fbd43d9b1ea86 Mon Sep 17 00:00:00 2001
From: Simon <simon.sessingoe@gmail.com>
Date: Mon, 27 Nov 2023 08:06:35 +0100
Subject: [PATCH 1/4] Remove port from hostname

---
 src/Pecee/Http/Request.php | 5 +++++
 src/Pecee/Http/Url.php     | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
index 100cd38..a09956a 100644
--- a/src/Pecee/Http/Request.php
+++ b/src/Pecee/Http/Request.php
@@ -405,6 +405,11 @@ class Request
      */
     public function setHost(?string $host): void
     {
+        // Strip any potential ports from hostname
+        if (strpos($host, ':') !== false) {
+            $host = strstr($host, strrchr($host, ':'), true);
+        }
+
         $this->host = $host;
     }
 
diff --git a/src/Pecee/Http/Url.php b/src/Pecee/Http/Url.php
index 9ba71ac..4bd2647 100644
--- a/src/Pecee/Http/Url.php
+++ b/src/Pecee/Http/Url.php
@@ -164,11 +164,6 @@ class Url implements JsonSerializable
      */
     public function setHost(string $host): self
     {
-        // Strip any potential ports from hostname
-        if (strpos($host, ':') !== false) {
-            $host = strstr($host, strrchr($host, ':'), true);
-        }
-
         $this->host = $host;
 
         return $this;

From 99ed44eb1e003cac8bc6be7ef48e9546e9152e6f Mon Sep 17 00:00:00 2001
From: Simon <simon.sessingoe@gmail.com>
Date: Wed, 29 Nov 2023 01:20:00 +0100
Subject: [PATCH 2/4] Fixed setHost nullable value

---
 src/Pecee/Http/Request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
index a09956a..e9f9742 100644
--- a/src/Pecee/Http/Request.php
+++ b/src/Pecee/Http/Request.php
@@ -406,7 +406,7 @@ class Request
     public function setHost(?string $host): void
     {
         // Strip any potential ports from hostname
-        if (strpos($host, ':') !== false) {
+        if (strpos((string)$host, ':') !== false) {
             $host = strstr($host, strrchr($host, ':'), true);
         }
 

From 0f55480156ae8a203ba0a907e319771da2c71b06 Mon Sep 17 00:00:00 2001
From: Simon <simon.sessingoe@gmail.com>
Date: Sat, 9 Dec 2023 05:36:30 +0100
Subject: [PATCH 3/4] Fixed rewrite-route not being executed in rare instances

---
 src/Pecee/SimpleRouter/Router.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
index f2f5987..3e1964a 100644
--- a/src/Pecee/SimpleRouter/Router.php
+++ b/src/Pecee/SimpleRouter/Router.php
@@ -562,7 +562,6 @@ class Router
 
                     if ($this->request->getRewriteRoute() !== null) {
                         $this->processedRoutes[] = $this->request->getRewriteRoute();
-                        $this->request->setHasPendingRewrite(false);
                     }
 
                     return $this->routeRequest();

From 3534233a76e31d4ecd4aa8b56fae4d730660755e Mon Sep 17 00:00:00 2001
From: Simon <simon.sessingoe@gmail.com>
Date: Sat, 9 Dec 2023 18:39:33 +0100
Subject: [PATCH 4/4] Fixed included triggering on other request-types than
 post

---
 src/Pecee/Http/Middleware/BaseCsrfVerifier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pecee/Http/Middleware/BaseCsrfVerifier.php b/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
index 7d26945..f9ce3fe 100644
--- a/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
+++ b/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
@@ -98,7 +98,7 @@ class BaseCsrfVerifier implements IMiddleware
      */
     public function handle(Request $request): void
     {
-        if ($this->skip($request) === false && ($request->isPostBack() === true || $this->isIncluded($request) === true)) {
+        if ($this->skip($request) === false && ($request->isPostBack() === true || $request->isPostBack() === true && $this->isIncluded($request) === true)) {
 
             $token = $request->getInputHandler()->value(
                 static::POST_KEY,