merge of http attachment and expires header bugfix

This commit is contained in:
Colin Kuskie 2006-02-11 05:46:39 +00:00
parent 484969d5d2
commit 1215b0b979
2 changed files with 4 additions and 3 deletions

View file

@ -42,6 +42,7 @@
file (Martin Kamerbeek / Procolix)
- fix [ 1429349 ] Invalid HTML returned by func=manageAssets
- fix [ 1429348 ] Textboxes need to filter CR/LF
- fix [ 1428481 ] WebGUI::HTTP::setFilename not working correctly in 6.8.5
6.8.5
- fix [ 1396957 ] Insufficient privileges check on the DataForm

View file

@ -105,13 +105,13 @@ sub getHeader {
} else {
$self->session->request->content_type($self->{_http}{mimetype} || "text/html") if ($self->session->request);
if ($self->session->setting->get("preventProxyCache")) {
$params{"-expires"} = "-1d";
$self->session->request->headers_out->set(Expires => "-1d");
}
if ($self->{_http}{filename}) {
$params{"-attachment"} = $self->{_http}{filename};
$self->session->request->headers_out->set('Content-Disposition' => qq!attachment; filename="$self->{_http}{filename}"!);
}
}
$params{"-cookie"} = $self->{_http}{cookie};
#$params{"-cookie"} = $self->{_http}{cookie};
$self->session->request->status_line($self->getStatus().' '.$self->{_http}{statusDescription}) if $self->session->request;
return;
}