[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /interface loncommon.pm

[raeburn]

raeburn		Mon Jun 16 05:12:31 2014 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
    /loncom/interface	loncommon.pm 
  Log:
  - Decoding user agent -- replace original field separator : with %
  - Add entry in lonBrowseDet for IE11 and newer.
    - Internet Explorer 11 uses rv:11.0 to denote version
      (e.g., compare with IE10 which uses MSIE 10 to denote version).
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.230 loncom/loncapa_apache.conf:1.231
--- loncom/loncapa_apache.conf:1.230	Sat Jan 11 20:38:03 2014
+++ loncom/loncapa_apache.conf	Mon Jun 16 05:12:27 2014
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.230 2014/01/11 20:38:03 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.231 2014/06/16 05:12:27 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -1612,7 +1612,7 @@
 PerlSetVar       lonCaptchaDir     /home/httpd/captchaspool
 PerlSetVar       lonCaptchaDb     /home/httpd/captchadb 
 PerlSetVar       lonFontsDir     /home/httpd/html/adm/fonts
-# & separated list of : separated fields in order of
+# & separated list of % separated fields in order of
 # - internal name to call it, 
 # - regexp that it should match (done case-insensitively)
 # - regexp that is should not match (done case-insensitively)
@@ -1620,7 +1620,7 @@
 # - a number that describes the minimum version that has mathml support
 # - a number that describes the minimum number version that has unicode support
 
-PerlSetVar       lonBrowsDet  explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:5&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&netscape:netscape:msie:netscape\/(\d+\.\d+):9999:7&netscape:netscape\/[7-9]:shouldnotmatch:netscape\/(\d+\.\d+):9999:7&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1&safari:safari:msie:safari\/([\d\.]+):9999:84&chrome:chrome:chromeframe:\s+chrome\/(\d+\.\d+):9999:1
+PerlSetVar       lonBrowsDet  explorer%msie%netscape%msie\s(\d+\.\d+)\;%9999%5&mozilla%mozilla\/[5-9]%msie%mozilla\/(\d+\.\d+)\s%9999%1&netscape%netscape%msie%netscape\/(\d+\.\d+)%9999%7&netscape%netscape\/[7-9]%shouldnotmatch%netscape\/(\d+\.\d+)%9999%7&amaya%amaya%mozilla%V(\d+\.\d+)\s%1%1&safari%safari%msie%safari\/([\d\.]+)%9999%84&chrome%chrome%chromeframe%\s+chrome\/(\d+\.\d+)%9999%1&explorer%\s+rv\:\d+\.\d+%firefox%\s+rv\:(\d+\.\d+)%9999%5
 
 PerlSetVar       lonTextBrowsers windows\s+ce:lynx
 PerlSetVar       lonScansDir  /home/httpd/scantron
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1192 loncom/interface/loncommon.pm:1.1193
--- loncom/interface/loncommon.pm:1.1192	Sat Jun  7 19:13:42 2014
+++ loncom/interface/loncommon.pm	Mon Jun 16 05:12:31 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1192 2014/06/07 19:13:42 raeburn Exp $
+# $Id: loncommon.pm,v 1.1193 2014/06/16 05:12:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2385,7 +2385,7 @@
     my $clientunicode='0';
     my $clientmobile=0;
     for (my $i=0;$i<=$#browsertype;$i++) {
-        my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]);
+        my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\%/,$browsertype[$i]);
 	if (($httpbrowser=~/$match/i)  && ($httpbrowser!~/$notmatch/i)) {
 	    $clientbrowser=$bname;
             $httpbrowser=~/$vreg/i;