[Catalyst-commits] r13926 - in Catalyst-Runtime/5.80/branches/psgi: . lib t/aggregate

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2011-01-24 23:28:10 +0000 (Mon, 24 Jan 2011)
New Revision: 13926

Modified:
   Catalyst-Runtime/5.80/branches/psgi/Makefile.PL
   Catalyst-Runtime/5.80/branches/psgi/TODO
   Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst.pm
   Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_fixenv-iis6.t
   Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_fixenv-lighttpd.t
Log:
Small docs and fixes

Modified: Catalyst-Runtime/5.80/branches/psgi/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/Makefile.PL	2011-01-24 19:57:47 UTC (rev 13925)
+++ Catalyst-Runtime/5.80/branches/psgi/Makefile.PL	2011-01-24 23:28:10 UTC (rev 13926)
@@ -129,7 +129,8 @@
     'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop
                                        # should have been a core fix.
     'Catalyst::Plugin::Unicode::Encoding' => '0.2',
-    'Catalyst::Plugin::Authentication' => '0.10010', # _config accessor in ::Credential::Password
+    'Catalyst::Plugin::Authentication' => '0.10016', # _config accessor in ::Credential::Password
+                                                     # make tests work with psgi
     'Catalyst::Authentication::Credential::HTTP' => '1.009',
     'Catalyst::Plugin::Session::Store::File' => '0.16',
     'Catalyst::Plugin::Session' => '0.21',

Modified: Catalyst-Runtime/5.80/branches/psgi/TODO
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/TODO	2011-01-24 19:57:47 UTC (rev 13925)
+++ Catalyst-Runtime/5.80/branches/psgi/TODO	2011-01-24 23:28:10 UTC (rev 13926)
@@ -30,11 +30,13 @@
 
 ###  Blockers
 
+  * lighttpd
+  * iis6
   * Add some tests for Catalyst::Test::local_request
   * Docs
   * Test all the options work on all of the scripts
   * Test (and fix if needed) Engine::Stomp and ::Wx
-  * Document how to use your own .psgi
+  * Document how to use your own .psgi (and how you need to do ReverseProxy yourself if you do)
   * Document migration for setting engine in setup
   * Document migration for setting engine in $ENV
   * Document what to do if you're a Prefork person

Modified: Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst.pm	2011-01-24 19:57:47 UTC (rev 13925)
+++ Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst.pm	2011-01-24 23:28:10 UTC (rev 13926)
@@ -2660,6 +2660,10 @@
             if -e $psgi_file;
     }
 
+    # Note - this is for back compatibility. Catalyst should not know
+    #        or care about how it's deployed. The recommended way of
+    #        configuring this is now to use the ReverseProxy middleware
+    #        yourself if you want it in a .psgi file.
     return Plack::Middleware::Conditional->wrap(
         $app->raw_psgi_app,
         builder   => sub { Plack::Middleware::ReverseProxy->wrap($_[0]) },

Modified: Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_fixenv-iis6.t
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_fixenv-iis6.t	2011-01-24 19:57:47 UTC (rev 13925)
+++ Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_fixenv-iis6.t	2011-01-24 23:28:10 UTC (rev 13926)
@@ -5,6 +5,11 @@
 
 use Test::More;
 
+ok 0, 'Known broken currently';
+done_testing;
+
+__END__
+
 eval "use FCGI";
 plan skip_all => 'FCGI required' if $@;
 

Modified: Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_fixenv-lighttpd.t
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_fixenv-lighttpd.t	2011-01-24 19:57:47 UTC (rev 13925)
+++ Catalyst-Runtime/5.80/branches/psgi/t/aggregate/unit_core_engine_fixenv-lighttpd.t	2011-01-24 23:28:10 UTC (rev 13926)
@@ -5,6 +5,11 @@
 
 use Test::More;
 
+ok 0, 'Known broken currently';
+done_testing;
+
+__END__
+
 eval "use FCGI";
 plan skip_all => 'FCGI required' if $@;