From: Florian Ragwitz <rafl@debian.org>
Date: Thu, 14 Jan 2010 04:02:47 +0000 (+0000)
Subject: Merge branch 'master' into psgi
X-Git-Tag: 5.89000~42
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=d5c1270360c155009fa138b6f0630044304f3c86

Merge branch 'master' into psgi

master:
Depend on n:c 0.12 to work on perl >= 5.11.2.
Version 5.80018.
canonical() is a no-op for the base uri.
Fix a deprecation warning in the tests.
Fix URI bug masked by HTTP::Request::AsCGI
Deprecate bare imports of Catalyst::Test - either use an app name or don't run the import method. As-per r12564
Apply patch to clarify uri_for action from Octavian Rasnita on list
Version 5.80017.
require autoclean once only
Bump version of ::Role::WithOverloading
Bump dep
Un stupid
Correctly pass argv option into Catalyst::Engine::HTTP
Changelog Adopt::NEXT warnings
Back out r12493, use \Q instead
Don't screw over people using --detach, <sigh>
Clarify comment.

Conflicts:
lib/Catalyst/Engine/CGI.pm
lib/Catalyst/Engine/HTTP.pm
t/aggregate/unit_core_script_server.t
---

d5c1270360c155009fa138b6f0630044304f3c86
diff --cc t/aggregate/unit_core_script_server.t
index d901354,b9ad60b..2508452
--- a/t/aggregate/unit_core_script_server.t
+++ b/t/aggregate/unit_core_script_server.t
@@@ -89,8 -89,8 +89,10 @@@ sub testOption 
      };
      # First element of RUN_ARGS will be the script name, which we don't care about
      shift @TestAppToTestScripts::RUN_ARGS;
 +    my $server = shift @TestAppToTestScripts::RUN_ARGS;
 +    like ref($server), qr/^Plack::Server/, 'Is a Plack Server';
+     # Mangle argv into the options..
+     $resultarray->[-1]->{argv} = $argstring;
      is_deeply \@TestAppToTestScripts::RUN_ARGS, $resultarray, "is_deeply comparison " . join(' ', @$argstring);
  }