Browse Source

Tweak front controller. Htaccess.

Taylor Otwell 11 years ago
parent
commit
ce64714b2f
2 changed files with 6 additions and 46 deletions
  1. 4 0
      public/.htaccess
  2. 2 46
      public/index.php

+ 4 - 0
public/.htaccess

@@ -2,6 +2,10 @@
     Options -MultiViews
     RewriteEngine On
 
+    # Redirect Trailing Slashes...
+	RewriteRule ^(.*)/$ /$1 [L,R=301]
+
+	# Handle Front Controller...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule ^ index.php [L]

+ 2 - 46
public/index.php

@@ -34,21 +34,6 @@ require __DIR__.'/../bootstrap/autoload.php';
 
 $app = require_once __DIR__.'/../bootstrap/start.php';
 
-/*
-|--------------------------------------------------------------------------
-| Capture The Request
-|--------------------------------------------------------------------------
-|
-| Next we will capture the HTTP request into an instance of the Symfony
-| request class. We will then pass that to a Laravel application for
-| processing and return the response we receive back from the app.
-|
-*/
-
-use Symfony\Component\HttpFoundation\Request;
-
-$request = Request::createFromGlobals();
-
 /*
 |--------------------------------------------------------------------------
 | Run The Application
@@ -61,35 +46,6 @@ $request = Request::createFromGlobals();
 |
 */
 
-$response = with(new Stack\Builder)
-				->push('Illuminate\Foundation\TrailingSlashRedirector')
-				->resolve($app)
-				->handle($request);
-
-/*
-|--------------------------------------------------------------------------
-| Close The Application & Send Response
-|--------------------------------------------------------------------------
-|
-| When closing the application, the session cookies will be set on the
-| request. Also, this is an opportunity to finish up any other work
-| that needs to be done before sending this response to browsers.
-|
-*/
-
-$app->callCloseCallbacks($request, $response);
-
-$response->send();
-
-/*
-|--------------------------------------------------------------------------
-| Shutdown The Application
-|--------------------------------------------------------------------------
-|
-| Once the app has finished running we'll fire off the shutdown events
-| so that any end work may be done by an application before we shut
-| off the process. This is the final thing to happen to requests.
-|
-*/
+use Symfony\Component\HttpFoundation\Request;
 
-$app->terminate($request, $response);
+$app->run(Request::createFromGlobals());