oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Session/Http: concentrate conditional check in 1 place, rather than in every one.

Browse source 
WebGUI.pm: Remove old line trying to print HTTP headers.
This commit is contained in:
Colin Kuskie 2006-02-11 23:11:38 +00:00
parent 2e5b73adf4
commit d30348e940
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/WebGUI.pm
View file

@ -234,7 +234,6 @@ sub uploadsHandler {
sub upgrading {
my $session = shift;
$session->http->getHeader;
$session->output->print($session->http->getHeader());
open(FILE,"<".$session->config->getWebguiRoot."/docs/maintenance.html");
while (<FILE>) {
$session->output->print($_);

5
lib/WebGUI/Session/Http.pm
View file

@ -98,12 +98,13 @@ Generates an HTTP header.
sub getHeader {
my $self = shift;
return undef if ($self->{_http}{noHeader});
return undef unless $self->session->request;
my %params;
if ($self->isRedirect()) {
$self->session->request->headers_out->set(Location => $self->{_http}{location});
$self->session->request->status(301);
} else {
$self->session->request->content_type($self->{_http}{mimetype} || "text/html") if ($self->session->request);
$self->session->request->content_type($self->{_http}{mimetype} || "text/html");
if ($self->session->setting->get("preventProxyCache")) {
$self->session->request->headers_out->set(Expires => "-1d");
}
@ -112,7 +113,7 @@ sub getHeader {
}
}
#$params{"-cookie"} = $self->{_http}{cookie};
$self->session->request->status_line($self->getStatus().' '.$self->{_http}{statusDescription}) if $self->session->request;
$self->session->request->status_line($self->getStatus().' '.$self->{_http}{statusDescription});
return;
}