Merge branch 'master' into psgi
authorFlorian Ragwitz <rafl@debian.org>
Thu, 14 Jan 2010 04:02:47 +0000 (04:02 +0000)
committerFlorian Ragwitz <rafl@debian.org>
Thu, 14 Jan 2010 04:02:47 +0000 (04:02 +0000)
commitd5c1270360c155009fa138b6f0630044304f3c86
tree66337f9607f2fda60b9e7bff3d086dc66ab8c90c
parent22a5833d436649391dc95877ca33f549308c6c3c
parentceec607af71355ec784131ea7ab4484e05566637
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
Makefile.PL
lib/Catalyst.pm
lib/Catalyst/Engine.pm
lib/Catalyst/Script/FastCGI.pm
lib/Catalyst/Script/Server.pm
lib/Catalyst/Test.pm
t/aggregate/unit_core_script_server.t
t/aggregate/unit_load_catalyst_test.t