Updated to reflect changes in Plack::Request API
This commit is contained in:
parent
cde333e931
commit
97432e2407
3 changed files with 13 additions and 32 deletions
|
|
@ -93,7 +93,7 @@ sub getCookies {
|
|||
my $self = shift;
|
||||
if ($self->session->request) {
|
||||
if ($self->session->request->isa('WebGUI::Session::Plack')) {
|
||||
return $self->session->request->get_request_cookies;
|
||||
return $self->session->request->{request}->cookies;
|
||||
}
|
||||
|
||||
# Have to require this instead of using it otherwise it causes problems for command-line scripts on some platforms (namely Windows)
|
||||
|
|
@ -389,17 +389,15 @@ sub setCookie {
|
|||
$ttl = (defined $ttl ? $ttl : '+10y');
|
||||
|
||||
if ($self->session->request) {
|
||||
if ( $self->session->request->isa('WebGUI::Session::Plack') ) {
|
||||
$self->session->request->set_response_cookie(
|
||||
$name => {
|
||||
value => $value,
|
||||
path => '/',
|
||||
expires => $ttl ne 'session' ? $ttl : undef,
|
||||
domain => $domain,
|
||||
}
|
||||
);
|
||||
return;
|
||||
}
|
||||
if ( $self->session->request->isa('WebGUI::Session::Plack') ) {
|
||||
$self->session->request->{response}->cookies->{$name} = {
|
||||
value => $value,
|
||||
path => '/',
|
||||
expires => $ttl ne 'session' ? $ttl : undef,
|
||||
domain => $domain,
|
||||
};
|
||||
}
|
||||
return;
|
||||
|
||||
require Apache2::Cookie;
|
||||
my $cookie = Apache2::Cookie->new($self->session->request,
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ sub AUTOLOAD {
|
|||
}
|
||||
|
||||
# Emulate/delegate/fake Apache2::* subs
|
||||
sub uri { shift->{request}->request_uri(@_) }
|
||||
sub uri { shift->{request}->path_info }
|
||||
sub param { shift->{request}->param(@_) }
|
||||
sub params { shift->{request}->params(@_) }
|
||||
sub params { shift->{request}->prameters->mixed(@_) }
|
||||
sub headers_in { shift->{request}->headers(@_) }
|
||||
sub headers_out { shift->{headers_out} }
|
||||
sub protocol { shift->{request}->protocol(@_) }
|
||||
|
|
@ -60,23 +60,6 @@ sub content_type {
|
|||
$self->{headers_out}->set( 'Content-Type' => $ct );
|
||||
}
|
||||
|
||||
# These two cookie subs are called from our wG Plack-specific code
|
||||
sub get_request_cookies {
|
||||
|
||||
# Get the hash of { name => CGI::Simple::Cookie }
|
||||
my $cookies = shift->{request}->cookies;
|
||||
|
||||
# Convert into { name => value } as expected by wG
|
||||
my %c = map { $_->name => $_->value } values %{$cookies};
|
||||
|
||||
return \%c;
|
||||
}
|
||||
|
||||
sub set_response_cookie {
|
||||
my ( $self, $name, $val ) = @_;
|
||||
$self->{response}->cookies->{$name} = $val;
|
||||
}
|
||||
|
||||
# TODO: I suppose this should do some sort of IO::Handle thing
|
||||
sub print {
|
||||
my $self = shift;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue