Undo special-casing location() setter. plack#224

See https://github.com/miyagawa/Plack/pull/224 for details.
ray1729 · Jun 10, 2011 · 877e10d · 877e10d
1 parent c0c8067
commit 877e10d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/lib/Plack/Response.pm b/lib/Plack/Response.pm
@@ -9,7 +9,6 @@ use Carp ();
 use Scalar::Util ();
 use HTTP::Headers;
 use URI::Escape ();
-use URI ();
 
 sub code    { shift->status(@_) }
 sub content { shift->body(@_)   }
@@ -67,14 +66,7 @@ sub content_encoding {
 
 sub location {
     my $self = shift;
-
-    if (@_) {
-        my $uri = shift;
-        my $loc = URI->new($uri)->as_string;
-        $self->headers->header('Location' => $loc);
-    }
-
-    return $self->headers->header('Location');
+    return $self->headers->header('Location' => @_);
 }
 
 sub redirect {

diff --git a/t/Plack-Response/redirect.t b/t/Plack-Response/redirect.t
@@ -21,11 +21,11 @@ use URI;
 
 {
     my $uri_invalid = "http://www.google.com/\r\nX-Injection: true\r\n\r\nHello World";
-    my $uri_valid   = URI->new($uri_invalid)->as_string;
 
     my $res = Plack::Response->new;
     $res->redirect($uri_invalid, 301);
-    is_deeply $res->finalize, [ 301, [ 'Location' => $uri_valid ], [] ];
+    my $psgi_res = $res->finalize;
+    ok $psgi_res->[1][1] !~ /\n/;
 }
 
 done_testing;