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

Replace calls to Apache2::RequestUtil->no_cache with direct sets of the appropriate HTTP headers.

Browse source
This commit is contained in:
Colin Kuskie 2010-06-16 13:59:54 -07:00
parent 9b91dd558b
commit 65873d538e
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -289,8 +289,11 @@ sub sendHeader {
my $date = ($userId eq "1") ? HTTP::Date::time2str($self->getLastModified) : HTTP::Date::time2str(); my $date = ($userId eq "1") ? HTTP::Date::time2str($self->getLastModified) : HTTP::Date::time2str();
# under these circumstances, don't allow caching # under these circumstances, don't allow caching
if ($userId ne "1" || $cacheControl eq "none" || $self->session->setting->get("preventProxyCache")) { if ($userId ne "1" || $cacheControl eq "none" || $self->session->setting->get("preventProxyCache")) {
$response->header("Cache-Control" => "private, max-age=1"); $response->header(
# $response->no_cache(1); # TODO - re-enable this? "Cache-Control" => "private, max-age=1",
"Pragma" => "no-cache",
"Cache-Control" => "no-cache",
);
} }
# in all other cases, set cache, but tell it to ask us every time so we don't mess with recently logged in users # in all other cases, set cache, but tell it to ask us every time so we don't mess with recently logged in users
else { else {
@ -298,8 +301,10 @@ sub sendHeader {
$response->header("Cache-Control" => "private, max-age=1"); $response->header("Cache-Control" => "private, max-age=1");
} }
else { else {
$response->header('Last-Modified' => $date); $response->header(
$response->header('Cache-Control' => "must-revalidate, max-age=" . $cacheControl); 'Last-Modified' => $date,
'Cache-Control' => "must-revalidate, max-age=" . $cacheControl,
);
} }
# do an extra incantation if the HTTP protocol is really old # do an extra incantation if the HTTP protocol is really old
if ($request->protocol =~ /(\d\.\d)/ && $1 < 1.1) { if ($request->protocol =~ /(\d\.\d)/ && $1 < 1.1) {
@ -320,8 +325,11 @@ sub _sendMinimalHeader {
my $self = shift; my $self = shift;
my $response = $self->session->response; my $response = $self->session->response;
$response->content_type('text/html; charset=UTF-8'); $response->content_type('text/html; charset=UTF-8');
$response->header('Cache-Control' => 'private'); $response->header(
# $response->no_cache(1); # TODO - re-enable this? 'Cache-Control' => 'private',
"Pragma" => "no-cache",
"Cache-Control" => "no-cache",
);
$response->status($self->getStatus()); $response->status($self->getStatus());
# $response->status_line($self->getStatus().' '.$self->getStatusDescription()); # TODO - re-enable # $response->status_line($self->getStatus().' '.$self->getStatusDescription()); # TODO - re-enable
return undef; return undef;