Small docs and fixes

diff --git a/Makefile.PL b/Makefile.PL
index 5d0180e..c30824e 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -129,7 +129,8 @@ my %conflicts = (
     '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',

diff --git a/TODO b/TODO
index f15683d..03a4674 100644 (file)
--- a/TODO
+++ b/TODO
@@ -30,11 +30,13 @@ http://github.com/willert/catalyst-plugin-log4perl-simple/tree
 
 ###  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

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 58d79eb..1d598dd 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2660,6 +2660,10 @@ sub setup_psgi_app {
             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]) },

diff --git a/t/aggregate/unit_core_engine_fixenv-iis6.t b/t/aggregate/unit_core_engine_fixenv-iis6.t
index 3b36c3e..917a994 100644 (file)
--- a/t/aggregate/unit_core_engine_fixenv-iis6.t
+++ b/t/aggregate/unit_core_engine_fixenv-iis6.t
@@ -5,6 +5,11 @@ use warnings;
 
 use Test::More;
 
+ok 0, 'Known broken currently';
+done_testing;
+
+__END__
+
 eval "use FCGI";
 plan skip_all => 'FCGI required' if $@;
 

diff --git a/t/aggregate/unit_core_engine_fixenv-lighttpd.t b/t/aggregate/unit_core_engine_fixenv-lighttpd.t
index 9f37e30..da33f3a 100644 (file)
--- a/t/aggregate/unit_core_engine_fixenv-lighttpd.t
+++ b/t/aggregate/unit_core_engine_fixenv-lighttpd.t
@@ -5,6 +5,11 @@ use warnings;
 
 use Test::More;
 
+ok 0, 'Known broken currently';
+done_testing;
+
+__END__
+
 eval "use FCGI";
 plan skip_all => 'FCGI required' if $@;