[interchange-cvs] interchange - jon modified 3 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Tue Apr 22 05:09:44 UTC 2008


User:      jon
Date:      2008-04-22 05:09:44 GMT
Modified:  lib/Vend Config.pm Dispatch.pm Server.pm
Log:
Change UserTrack behavior to better match expectations.

* "UserTrack no" formerly also disabled TrackFile, because the whole
  Vend::Track module was disabled. This was not expected behavior. People
  are apparently using TrackFile fairly commonly, so this would make
  "UserTrack no" pretty unattractive.

* Make "UserTrack no" only disable sending the X-Track HTTP response header.

* As before, leaving TrackFile undefined will stop logging to a track file.

* Make UserTrack default to false now, which is an incompatible change, but
  one that I don't expect to adversely affect anyone, as the X-Track response
  header doesn't seem to get used. Adding "UserTrack yes" to catalog.cfg
  brings it back.

In short, most people upgrading will stop having an X-Track response header
sent, and otherwise will notice no difference.

Revision  Changes    Path
2.235                interchange/lib/Vend/Config.pm


rev 2.235, prev_rev 2.234
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.234
retrieving revision 2.235
diff -u -u -r2.234 -r2.235
--- Config.pm	26 Feb 2008 13:55:47 -0000	2.234
+++ Config.pm	22 Apr 2008 05:09:44 -0000	2.235
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.234 2008-02-26 13:55:47 markj Exp $
+# $Id: Config.pm,v 2.235 2008-04-22 05:09:44 jon Exp $
 #
 # Copyright (C) 2002-2008 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -54,7 +54,7 @@
 use Vend::Data;
 use Vend::Cron;
 
-$VERSION = substr(q$Revision: 2.234 $, 10);
+$VERSION = substr(q$Revision: 2.235 $, 10);
 
 my %CDname;
 my %CPname;
@@ -705,7 +705,7 @@
 	['ExternalExport',	 undef,		     	 join " ", @External_directives],
 	['CartTrigger',		 'routine_array',	 ''],
 	['CartTriggerQuantity',	'yesno',		 'no'],
-    ['UserTrack',        'yesno',            'yes'],
+    ['UserTrack',        'yesno',            'no'],
 	['DebugHost',	     'ip_address_regexp',	''],
 	['BounceReferrals',  'yesno',            'no'],
 



1.96                 interchange/lib/Vend/Dispatch.pm


rev 1.96, prev_rev 1.95
Index: Dispatch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Dispatch.pm,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -u -r1.95 -r1.96
--- Dispatch.pm	25 Feb 2008 10:02:30 -0000	1.95
+++ Dispatch.pm	22 Apr 2008 05:09:44 -0000	1.96
@@ -1,6 +1,6 @@
 # Vend::Dispatch - Handle Interchange page requests
 #
-# $Id: Dispatch.pm,v 1.95 2008-02-25 10:02:30 racke Exp $
+# $Id: Dispatch.pm,v 1.96 2008-04-22 05:09:44 jon Exp $
 #
 # Copyright (C) 2002-2008 Interchange Development Group
 # Copyright (C) 2002 Mike Heins <mike at perusion.net>
@@ -26,7 +26,7 @@
 package Vend::Dispatch;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.95 $, 10);
+$VERSION = substr(q$Revision: 1.96 $, 10);
 
 use POSIX qw(strftime);
 use Vend::Util;
@@ -1494,8 +1494,9 @@
 	Vend::Server::set_process_name("$Vend::Cat $CGI::host $sessionid " . ($Vend::Session->{username} || '-') . " $Vend::FinalPath");
 
 # TRACK
-	$Vend::Track = new Vend::Track
-		if $Vend::Cfg->{UserTrack} and not ($Vend::admin and ! $::Variable->{MV_TRACK_ADMIN});
+	$Vend::Track = Vend::Track->new
+		if ($Vend::Cfg->{UserTrack} or $Vend::Cfg->{TrackFile})
+            and not ($Vend::admin and ! $::Variable->{MV_TRACK_ADMIN});
 # END TRACK
 
 	if($Vend::Cfg->{DisplayErrors} and $Global::DisplayErrors) {



2.91                 interchange/lib/Vend/Server.pm


rev 2.91, prev_rev 2.90
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.90
retrieving revision 2.91
diff -u -u -r2.90 -r2.91
--- Server.pm	26 Mar 2008 14:19:35 -0000	2.90
+++ Server.pm	22 Apr 2008 05:09:44 -0000	2.91
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.90 2008-03-26 14:19:35 jon Exp $
+# $Id: Server.pm,v 2.91 2008-04-22 05:09:44 jon Exp $
 #
 # Copyright (C) 2002-2008 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -26,7 +26,7 @@
 package Vend::Server;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 2.90 $, 10);
+$VERSION = substr(q$Revision: 2.91 $, 10);
 
 use Cwd;
 use POSIX qw(setsid strftime);
@@ -565,7 +565,7 @@
 
 # TRACK
         $Vend::StatusLine .= "X-Track: " . $Vend::Track->header() . "\r\n"
-			if $Vend::Track;
+			if $Vend::Track and $Vend::Cfg->{UserTrack};
 # END TRACK        
         $Vend::StatusLine .= "Pragma: no-cache\r\n"
 			if delete $::Scratch->{mv_no_cache};
@@ -615,7 +615,7 @@
 		$| = 1;
 		select $save;
         $Vend::StatusLine .= "\r\nX-Track: " . $Vend::Track->header() . "\r\n"
-			if $Vend::Track;
+			if $Vend::Track and $Vend::Cfg->{UserTrack};
 # END TRACK                            
         $Vend::StatusLine .= "Pragma: no-cache\r\n"
 			if delete $::Scratch->{mv_no_cache};
@@ -679,7 +679,7 @@
 		print $fh canon_status("Content-Type: text/html; charset=$response_charset");
 # TRACK        
         print $fh canon_status("X-Track: " . $Vend::Track->header())
-			if $Vend::Track;
+			if $Vend::Track and $Vend::Cfg->{UserTrack};
 # END TRACK
 	}
 	print $fh canon_status("Pragma: no-cache")







More information about the interchange-cvs mailing list