summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2002-02-09 17:03:55 +0000
committerivan <ivan>2002-02-09 17:03:55 +0000
commit5bb9eff0716710611f50071bec6167b4514edb48 (patch)
tree536f41d1d2d041591dd70e5d68d548c5ad89d2c6
parent58b6cf13486080bae2136b13b421db6c9163368e (diff)
okay, both Apache::ASP and Mason should set no-cache headers now (closes: Bug#23)
-rw-r--r--FS/FS/CGI.pm18
-rw-r--r--htetc/global.asa4
-rw-r--r--htetc/handler.pl5
3 files changed, 18 insertions, 9 deletions
diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 4093214..d1c56a2 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -12,10 +12,6 @@ use FS::UID;
@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable
small_custview);
-@header = ( '-Expires' => '-1',
- '-Pragma' => 'no-cache',
- '-Cache-Control' => 'no-cache' );
-
=head1 NAME
FS::CGI - Subroutines for the web interface
@@ -58,6 +54,9 @@ sub header {
<TITLE>
$title
</TITLE>
+ <META HTTP-Equiv="Cache-Control" Content="no-cache">
+ <META HTTP-Equiv="Pragma" Content="no-cache">
+ <META HTTP-Equiv="Expires" Content="0">
</HEAD>
<BODY BGCOLOR="#e8e8e8"$etc>
<FONT SIZE=7>
@@ -88,24 +87,27 @@ sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... );
This is depriciated. Don't use it.
-Sends headers and an HTML error message.
+Sends an HTML error message.
=cut
sub idiot {
#warn "idiot depriciated";
my($error)=@_;
- my $cgi = &FS::UID::cgi();
+# my $cgi = &FS::UID::cgi();
# if ( $cgi->isa('CGI::Base') ) {
# no strict 'subs';
# &CGI::Base::SendHeaders;
# } else {
- print $cgi->header( @FS::CGI::header );
+# print $cgi->header( @FS::CGI::header );
# }
print <<END;
<HTML>
<HEAD>
<TITLE>Error processing your request</TITLE>
+ <META HTTP-Equiv="Cache-Control" Content="no-cache">
+ <META HTTP-Equiv="Pragma" Content="no-cache">
+ <META HTTP-Equiv="Expires" Content="0">
</HEAD>
<BODY>
<CENTER>
@@ -123,7 +125,7 @@ END
This is depriciated. Don't use it.
-Sends headers and an HTML error message, then exits.
+Sends an HTML error message, then exits.
=cut
diff --git a/htetc/global.asa b/htetc/global.asa
index c4b4380..cf6b0f6 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -47,6 +47,10 @@ use FS::svc_www;
use FS::type_pkgs;
sub Script_OnStart {
+ $Response->AddHeader('Pragma' => 'no-cache');
+ $Response->AddHeader('Cache-control' => 'no-cache');
+ $Response->AddHeader('Expires' => 0);
+
$cgi = new CGI;
&cgisuidsetup($cgi);
$p = popurl(2);
diff --git a/htetc/handler.pl b/htetc/handler.pl
index f80c79e..5be19c4 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -109,7 +109,10 @@ sub handler
$r->content_type('text/html');
#eorar
- # @FS::CGI::headers or some other way to set no-cache headers!!!
+ my $headers = $r->headers_out;
+ $headers->{'Pragma'} = $headers->{'Cache-control'} = 'no-cache';
+ #$r->no_cache(1);
+ $headers->{'Expires'} = '0';
my $status = $ah->handle_request($r);