[interchange-cvs] interchange - kwalsh modified lib/Vend/Server.pm

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Wed Aug 2 08:19:16 EDT 2006


User:      kwalsh
Date:      2006-08-02 12:19:15 GMT
Modified:  lib/Vend Server.pm
Log:
    * The NotRobotUA and RobotUA checks were being blocked when both
      HostnameLookups and RobotHost were configured.

Revision  Changes    Path
2.71      +9 -7      interchange/lib/Vend/Server.pm


rev 2.71, prev_rev 2.70
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.70
retrieving revision 2.71
diff -u -r2.70 -r2.71
--- Server.pm	18 Jul 2006 21:49:28 -0000	2.70
+++ Server.pm	2 Aug 2006 12:19:15 -0000	2.71
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.70 2006/07/18 21:49:28 racke Exp $
+# $Id: Server.pm,v 2.71 2006/08/02 12:19:15 kwalsh Exp $
 #
 # Copyright (C) 2002-2005 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.70 $, 10);
+$VERSION = substr(q$Revision: 2.71 $, 10);
 
 use Cwd;
 use POSIX qw(setsid strftime);
@@ -280,12 +280,14 @@
 			$CGI::values{mv_tmp_session} = 1;
 		}
 	}
-	elsif ($Global::NotRobotUA and $CGI::useragent =~ $Global::NotRobotUA) {
-		# do nothing
-	}
-	elsif ($Global::RobotUA and $CGI::useragent =~ $Global::RobotUA) {
+	unless ($CGI::values{mv_tmp_session}) { 
+		if ($Global::NotRobotUA and $CGI::useragent =~ $Global::NotRobotUA) {
+			# do nothing
+		}
+		elsif ($Global::RobotUA and $CGI::useragent =~ $Global::RobotUA) {
 #::logDebug("It is a robot by UA!");
-		$CGI::values{mv_tmp_session} = 1;
+			$CGI::values{mv_tmp_session} = 1;
+		}
 	}
 }
 








More information about the interchange-cvs mailing list