[interchange-cvs] interchange - racke modified lib/Vend/Util.pm

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Mon May 5 17:29:00 2003


User:      racke
Date:      2003-05-05 21:28:23 GMT
Modified:  lib/Vend Util.pm
Log:
don't use NoCache directive any longer

Revision  Changes    Path
2.57      +4 -5      interchange/lib/Vend/Util.pm


rev 2.57, prev_rev 2.56
Index: Util.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Util.pm,v
retrieving revision 2.56
retrieving revision 2.57
diff -u -r2.56 -r2.57
--- Util.pm	1 Apr 2003 04:12:32 -0000	2.56
+++ Util.pm	5 May 2003 21:28:23 -0000	2.57
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# $Id: Util.pm,v 2.56 2003/04/01 04:12:32 mheins Exp $
+# $Id: Util.pm,v 2.57 2003/05/05 21:28:23 racke Exp $
 # 
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -87,7 +87,7 @@
 use Vend::File;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.56 $, 10);
+$VERSION = substr(q$Revision: 2.57 $, 10);
 
 my $Eval_routine;
 my $Eval_routine_file;
@@ -1158,7 +1158,6 @@
 		unless defined $r;
 
 	my $secure;
-	my $can_cache = ! $Vend::Cfg->{NoCache}{$path};
 	my @parms;
 
 	if(exists $Vend::Cfg->{AlwaysSecure}{$path}) {
@@ -1193,9 +1192,9 @@
 	my($id, $ct);
 	$id = $Vend::SessionID
 		unless $opt->{no_session_id}
-		or     ($Vend::Cookie and $can_cache and $::Scratch->{mv_no_session_id});
+		or     ($Vend::Cookie and $::Scratch->{mv_no_session_id});
 	$ct = ++$Vend::Session->{pageCount}
-		unless $opt->{no_count} or ($can_cache && $::Scratch->{mv_no_count});
+		unless $opt->{no_count} or $::Scratch->{mv_no_count};
 
 	if($opt->{match_security}) {
 		$opt->{secure} = $CGI::secure;