From: Tomas Doran (t0m) <t0m@state51.co.uk>
Date: Mon, 8 Aug 2011 21:32:07 +0000 (+0000)
Subject: The nginx bullshit can just die
X-Git-Tag: 5.9000~10^2~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=cb1e348badf54b4ceacca793b0baa6312e2a7e5d

The nginx bullshit can just die
---

diff --git a/Changes b/Changes
index 35028a9..3c33387 100644
--- a/Changes
+++ b/Changes
@@ -31,6 +31,12 @@
   - Documentation which was in the now removed Catalyst::Engine::* classes
     has been moved to Catalyst::Manual::Deployment
 
+ Changes:
+
+  - nginx specific behaviour is removed as it is not needed with any
+    web server configuration I can come up with (recommended config is
+    documented in Catalst::Manual::Deployment::nginx::FastCGI)
+
 5.89003 2011-07-28 20:11:50 (TRIAL release)
 
  Backward compatibility fixes:
diff --git a/TODO b/TODO
index ebfc646..d6a66e5 100644
--- a/TODO
+++ b/TODO
@@ -59,16 +59,6 @@ http://github.com/willert/catalyst-plugin-log4perl-simple/tree
   * Better docs for stopping using Engine::HTTP::Prefork and
     starting using Starman, maybe?
 
-  * Test nginx middleware to determine if it is needed with:
-
-    root app - with use_request_uri_for_path
-    root app - without use_request_uri_for_path
-    non-root app - with use_request_uri_for_path
-    non-root app - without use_request_uri_for_path
-
-    If it isn't needed, remove. If it is needed, split it out into it's own
-    file and document why it's needed.
-
   * I've noticed a small difference with Catalyst::Test. The latest stable
     version include two headers, 'host' and 'https'. They are missing from
     this version - Pedro Melo on list
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 03f34f8..6155e9c 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2740,20 +2740,6 @@ sub apply_default_middlewares {
     # http://lists.scsys.co.uk/pipermail/catalyst/2006-June/008361.html
     $psgi_app = Plack::Middleware::LighttpdScriptNameFix->wrap($psgi_app);
 
-    $psgi_app = Plack::Middleware::Conditional->wrap(
-        $psgi_app,
-        condition => $server_matches->(qr/^nginx/),
-        builder   => sub {
-            my ($to_wrap) = @_;
-            return sub {
-                my ($env) = @_;
-                my $script_name = $env->{SCRIPT_NAME};
-                $env->{PATH_INFO} =~ s/^$script_name//g;
-                return $to_wrap->($env);
-            };
-        },
-    );
-
     # we're applying this unconditionally as the middleware itself already makes
     # sure it doesn't fuck things up if it's not running under one of the right
     # IIS versions