From 00c44a74d2000609e2637b07a8de230692e1c64a Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 6 May 2016 13:03:46 -0500 Subject: [PATCH] some cleaning --- drivers/LaravelValetDriver.php | 4 ---- server.php | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/LaravelValetDriver.php b/drivers/LaravelValetDriver.php index 68127b3..7cf13fb 100644 --- a/drivers/LaravelValetDriver.php +++ b/drivers/LaravelValetDriver.php @@ -47,10 +47,6 @@ public function isStaticFile($sitePath, $siteName, $uri) */ public function frontControllerPath($sitePath, $siteName, $uri) { - if (isset($_SERVER['HTTP_X_ORIGINAL_HOST'])) { - $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_X_ORIGINAL_HOST']; - } - return $sitePath.'/public/index.php'; } } diff --git a/server.php b/server.php index 8805c15..6c32bcc 100644 --- a/server.php +++ b/server.php @@ -74,10 +74,20 @@ function show_valet_404() } /** - * Dispatch the request. + * Overwrite the HTTP host for Ngrok. + */ +if (isset($_SERVER['HTTP_X_ORIGINAL_HOST'])) { + $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_X_ORIGINAL_HOST']; +} + +/** + * Allow driver to mutate incoming URL. */ $uri = $valetDriver->mutateUri($uri); +/** + * Determine if the incoming request is for a static file. + */ $uriPathInfo = pathinfo($uri); $isPhpFile = false; @@ -90,6 +100,9 @@ function show_valet_404() return $valetDriver->serveStaticFile($staticFilePath, $valetSitePath, $siteName, $uri); } +/** + * Attempt to dispatch to a front controller. + */ $frontControllerPath = $valetDriver->frontControllerPath( $valetSitePath, $siteName, $uri );