[interchange-cvs] interchange - heins modified scripts/interchange.PL
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Sun Feb 3 02:19:01 2002
User: heins
Date: 2002-02-03 07:18:52 GMT
Modified: scripts interchange.PL
Log:
* Remove dead code and unused Variable.
* Change bad variable initialization (wrong package)
* Code now appears to run warning-free (when starting with
perl -w bin/interchange -r).
Revision Changes Path
2.20 +3 -10 interchange/scripts/interchange.PL
rev 2.20, prev_rev 2.19
Index: interchange.PL
===================================================================
RCS file: /anon_cvs/repository/interchange/scripts/interchange.PL,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -r2.19 -r2.20
--- interchange.PL 2 Feb 2002 08:57:11 -0000 2.19
+++ interchange.PL 3 Feb 2002 07:18:52 -0000 2.20
@@ -50,7 +50,7 @@
#
# Interchange version 4.9.0
#
-# $Id: interchange.PL,v 2.19 2002/02/02 08:57:11 mheins Exp $
+# $Id: interchange.PL,v 2.20 2002/02/03 07:18:52 mheins Exp $
#
# Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
#
@@ -1841,11 +1841,6 @@
and ! defined $Vend::InternalHTTP )
{
my $real = $Global::SelectorAlias{$CGI::script_name};
- if(defined $Vend::NoFork) {
- $Vend::Save = {} unless $Vend::Save;
- $Vend::Save->{VendURL} = $Vend::Cfg->{VendURL};
- $Vend::Save->{SecureURL} = $Vend::Cfg->{SecureURL};
- }
unless ( $CGI::secure or
$Vend::Cfg->{SecureURL} =~ m{$CGI::script_name$} and
$Vend::Cfg->{VendURL} !~ m{/nph-[^/]+$} and
@@ -1910,7 +1905,7 @@
$Vend::Cookie = 1;
}
elsif ($::Instance->{CookieName} and defined $CGI::cookie) {
- $CGI::cookie =~ m{$Vend::CookieName=($Vend::Cfg->{CookiePattern})};
+ $CGI::cookie =~ m{$::Instance->{CookieName}=($Vend::Cfg->{CookiePattern})};
$seed = $sessionid = $1;
$::Instance->{ExternalCookie} = $sessionid || 1;
$Vend::CookieID = $Vend::Cookie = 1;
@@ -2056,7 +2051,7 @@
#::logDebug("session name='$Vend::SessionName'\n");
- $Vend::Interpolate::Calc_initialized = 0;
+ $Vend::Calc_initialized = 0;
$CGI::values{mv_session_id} = $Vend::Session->{id} = $Vend::SessionID;
if($Vend::Cfg->{CookieLogin}) {
@@ -2829,8 +2824,6 @@
eval {
require Vend::Payment::CyberCash;
};
-
- $Vend::CyberCash = ! $@;
# These modules no longer necessary, why take up memory?
delete $INC{'Getopt/Long.pm'};