Merge branch 'master' into psgi

* master:
  Unbreak remote server tests
  Add MYMETA.yml to .gitignore
  Add missing Catalyst::Devel author dep
  Append $\ in Catalyst::Response->print

diff --git a/.gitignore b/.gitignore
index 4541780..a853ad2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 !.gitignore
 Makefile*
 !Makefile.PL
+MYMETA.yml
 META.yml
 blib
 build

diff --git a/Makefile.PL b/Makefile.PL
index 6083b74..2ff732c 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -76,6 +76,7 @@ else {
 
 author_requires 'CatalystX::LeakChecker', '0.05';
 author_requires 'File::Copy::Recursive'; # For http server test
+author_requires 'Catalyst::Devel', '1.0'; # For http server test
 
 author_tests 't/author';
 author_requires(map {; $_ => 0 } qw(

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index 2bf4dfe..818ae86 100644 (file)
--- a/lib/Catalyst/Response.pm
+++ b/lib/Catalyst/Response.pm
@@ -201,6 +201,7 @@ sub print {
         defined $self->write($,) or return;
         defined $self->write($_) or return;
     }
+    defined $self->write($\) or return;
 
     return 1;
 }

diff --git a/t/aggregate/live_engine_response_print.t b/t/aggregate/live_engine_response_print.t
index ad00ea3..4e8f024 100644 (file)
--- a/t/aggregate/live_engine_response_print.t
+++ b/t/aggregate/live_engine_response_print.t
@@ -12,7 +12,7 @@ use Catalyst::Test 'TestApp';
 my $expected = {
    one => "foo",
    two => "foobar",
-   three => "foo,bar,baz",
+   three => "foo,bar,baz:",
 };
 
 for my $action ( sort keys %{$expected} ) {

diff --git a/t/lib/TestApp/Controller/Engine/Response/Print.pm b/t/lib/TestApp/Controller/Engine/Response/Print.pm
index 8d986f8..13f3d04 100644 (file)
--- a/t/lib/TestApp/Controller/Engine/Response/Print.pm
+++ b/t/lib/TestApp/Controller/Engine/Response/Print.pm
@@ -19,7 +19,9 @@ sub three :Relative {
     my ( $self, $c ) = @_;
 
     local $, = ',';
+    local $\ = ':';
     $c->res->print(qw/foo bar baz/);
 }
 
+
 1;