From: Yuval Kogman <nothingmuch@woobling.org>
Date: Mon, 14 Nov 2005 18:05:00 +0000 (+0000)
Subject: Revert readonly headers
X-Git-Tag: 5.7099_04~924
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=67c3275d51699ad13bf6a8e8b25f13e8938b8a4c

Revert readonly headers
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index fde9681..8cb5af5 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -16,8 +16,6 @@ use Path::Class;
 use Time::HiRes qw/gettimeofday tv_interval/;
 use URI;
 use Scalar::Util qw/weaken/;
-use Hash::Util qw/lock_hash/;
-use HTTP::Headers::ReadOnly;
 use attributes;
 
 __PACKAGE__->mk_accessors(
@@ -1025,11 +1023,7 @@ Finalizes cookies.
 
 =cut
 
-sub finalize_cookies {
-	my $c = shift;
-	$c->engine->finalize_cookies( $c, @_ );
-	lock_hash( %$_ ) for $c->res->cookies, values %{ $c->res->cookies };
-}
+sub finalize_cookies { my $c = shift; $c->engine->finalize_cookies( $c, @_ ) }
 
 =item $c->finalize_error
 
@@ -1072,8 +1066,6 @@ sub finalize_headers {
 
     $c->engine->finalize_headers( $c, @_ );
 
-	bless $c->response->headers, "HTTP::Headers::ReadOnly";
-
     # Done
     $c->response->{_finalized_headers} = 1;
 }
@@ -1782,9 +1774,6 @@ Writes $data to the output stream. When using this method directly, you
 will need to manually set the C<Content-Length> header to the length of
 your output data, if known.
 
-Also note that any headers created after the write can  no longer be added, and
-this includes cookies.
-
 =cut
 
 sub write {
diff --git a/lib/HTTP/Headers/ReadOnly.pm b/lib/HTTP/Headers/ReadOnly.pm
deleted file mode 100644
index 7f3caac..0000000
--- a/lib/HTTP/Headers/ReadOnly.pm
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/perl
-
-package HTTP::Headers::ReadOnly;
-use base qw/HTTP::Headers/;
-
-use strict;
-use warnings;
-
-use Carp qw/croak/;
-use Class::Inspector;
-
-sub _jerk_it {
-	croak "Can't modify headers after headers have been sent to the client";
-}
-
-sub _header {
-	my ( $self, $field, $val, $op ) = @_;
-	shift;
-	_jerk_it if $val;
-
-	$self->SUPER::_header(@_);
-}
-
-BEGIN {
-	for ( @{ Class::Inspector->functions( "HTTP::Headers" ) }) {
-		no strict 'refs';
-		*$_ = \&_jerk_it if /remove|clear/;
-		
-	}
-}
-
-__PACKAGE__;
-
-__END__
-
-=pod
-
-=head1 NAME
-
-HTTP::Headers::ReadOnly - Immutable HTTP::headers
-
-=head1 SYNOPSIS
-
-	my $headers = HTTP::Headers->new(...);
-
-	bless $headers, "HTTP::Headers::ReadOnly";
-
-	$headers->content_type( "foo" ); # dies
-
-=head1 DESCRIPTION
-
-This class blocks write access to a L<HTTP::Headers> object.
-
-It is used to raise errors in L<Catalyst> if the header object is modified
-after C<finalize_headers>.
-
-=cut
-
-
diff --git a/t/unit/core/headers.t b/t/unit/core/headers.t
deleted file mode 100644
index d075b39..0000000
--- a/t/unit/core/headers.t
+++ /dev/null
@@ -1,35 +0,0 @@
-use Test::More tests => 6;
-use strict;
-use warnings;
-
-{
-
-    package MyApp;
-    use Catalyst qw/-Engine=Test/;
-    use Test::Exception;
-
-    sub stream_it : Local {
-        my ( $self, $c ) = @_;
-
-        lives_ok { $c->res->headers->content_encoding("moose") }
-          "can set header";
-        lives_ok { $c->res->headers->remove_header("moose") }
-          "can remove header";
-        lives_ok { $c->res->cookies->{yadda} = { value => "ping" } }
-          "can make cookie";
-        $c->write("foo");
-        throws_ok { $c->res->headers->content_encoding("moose") }
-          qr/can't modify/i, "can't set header after write";
-        throws_ok { $c->res->headers->remove_header("moose") }
-          qr/can't modify/i, "can't remove header after write";
-        throws_ok { $c->res->cookies->{yadda} = { value => "ping" } }
-          qr/read-only/i, "can't make cookie after write";
-    }
-
-    __PACKAGE__->setup;
-}
-
-use Catalyst::Test qw/MyApp/;
-
-get "/stream_it";
-