From ccd35e52311f941b762543eff7bb6ae59cb6fcba Mon Sep 17 00:00:00 2001 From: Matt Stauffer Date: Thu, 22 Dec 2022 13:26:47 -0500 Subject: [PATCH] Drop exits, fix 404 path --- cli/Valet/Server.php | 2 +- server.php | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cli/Valet/Server.php b/cli/Valet/Server.php index ba0d01f..08c5c76 100644 --- a/cli/Valet/Server.php +++ b/cli/Valet/Server.php @@ -43,7 +43,7 @@ public static function domainFromSiteName(string $siteName): string public static function show404() { http_response_code(404); - require __DIR__.'/cli/templates/404.html'; + require __DIR__.'/../../cli/templates/404.html'; exit; } diff --git a/server.php b/server.php index 3a49978..05ea5c6 100644 --- a/server.php +++ b/server.php @@ -68,12 +68,9 @@ $isPhpFile = pathinfo($uri, PATHINFO_EXTENSION) === 'php'; if ($uri !== '/' && ! $isPhpFile && $staticFilePath = $valetDriver->isStaticFile($valetSitePath, $siteName, $uri)) { - exit('is static'); return $valetDriver->serveStaticFile($staticFilePath, $valetSitePath, $siteName, $uri); } -exit('is not static'); - /** * Allow for drivers to take pre-loading actions (e.g. setting server variables). */