Merge pull request #696 from skipperbent/v5-release

V5 release
skipperbent · Dec 9, 2023 · 7098f6a · 7098f6a
2 parents fdbd72c + 8923bee
commit 7098f6a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/Pecee/Http/Middleware/BaseCsrfVerifier.php b/src/Pecee/Http/Middleware/BaseCsrfVerifier.php
@@ -98,7 +98,7 @@ protected function skip(Request $request): bool
      */
     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,

diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php
@@ -405,6 +405,11 @@ public function setUrl(Url $url): void
      */
     public function setHost(?string $host): void
     {
+        // Strip any potential ports from hostname
+        if (strpos((string)$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
@@ -164,11 +164,6 @@ public function getHost(bool $includeTrails = false): ?string
      */
     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;

diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
@@ -562,7 +562,6 @@ protected function handleException(Exception $e): ?string
 
                     if ($this->request->getRewriteRoute() !== null) {
                         $this->processedRoutes[] = $this->request->getRewriteRoute();
-                        $this->request->setHasPendingRewrite(false);
                     }
 
                     return $this->routeRequest();