[LON-CAPA-cvs] cvs: loncom(version_2_11_X) / loncapa_apache.conf

[raeburn]

raeburn		Mon Jun 16 05:51:16 2014 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom	loncapa_apache.conf 
  Log:
  - For 2.11
    - Backport 1.231
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.215.2.12 loncom/loncapa_apache.conf:1.215.2.13
--- loncom/loncapa_apache.conf:1.215.2.12	Sat Jan 11 20:40:54 2014
+++ loncom/loncapa_apache.conf	Mon Jun 16 05:51:15 2014
@@ -2,7 +2,7 @@
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
 
-# $Id: loncapa_apache.conf,v 1.215.2.12 2014/01/11 20:40:54 raeburn Exp $
+# $Id: loncapa_apache.conf,v 1.215.2.13 2014/06/16 05:51:15 raeburn Exp $
 
 #
 # LON-CAPA Section (extensions to httpd.conf daemon configuration)
@@ -1602,7 +1602,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)
@@ -1610,7 +1610,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