[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

[raeburn]

raeburn		Sun Aug  7 20:56:25 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport 1.1201
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.104 loncom/interface/loncommon.pm:1.1075.2.105
--- loncom/interface/loncommon.pm:1.1075.2.104	Sat Aug  6 23:21:52 2016
+++ loncom/interface/loncommon.pm	Sun Aug  7 20:56:23 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.104 2016/08/06 23:21:52 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.105 2016/08/07 20:56:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4683,13 +4683,13 @@
 ###############################################
 
 sub check_ip_acc {
-    my ($acc)=@_;
+    my ($acc,$clientip)=@_;
     &Apache::lonxml::debug("acc is $acc");
     if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
         return 1;
     }
     my $allowed=0;
-    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
+    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'} || $clientip;
 
     my $name;
     foreach my $pattern (split(',',$acc)) {