--- loncom/loncapa_apache.conf	2011/05/26 14:25:39	1.192.2.4
+++ loncom/loncapa_apache.conf	2010/03/10 21:25:22	1.193
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.192.2.4 2011/05/26 14:25:39 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.193 2010/03/10 21:25:22 droeschl Exp $
 ##
 
 #
@@ -59,7 +59,6 @@ PerlAuthenHandler	'sub { return OK }'
 <LocationMatch "^(/adm/lonIcons|/adm/jQuery|/adm/jsMath|/res/adm/pages|/ckeditor)">
         ExpiresActive On
         ExpiresDefault "access plus 12 hours"
-        Header set Cache-Control "public, no-transform"
 </LocationMatch>
 
 <LocationMatch "^/+res.*">
@@ -106,24 +105,17 @@ SetHandler perl-script
 PerlHandler Apache::portfolio
 </Location>
 
-<Location /adm/pdfupload>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler Apache::lonacc
-SetHandler perl-script
-PerlHandler             Apache::lonpdfupload
-ErrorDocument     403 /adm/login
-ErrorDocument     404 /adm/notfound.html
-ErrorDocument     406 /adm/roles
-ErrorDocument     500 /adm/errorhandler
-</Location>
-
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
 PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
+<LocationMatch "^/pdfupload.*">
+SetHandler perl-script
+PerlHandler             Apache::lonpdfupload
+</LocationMatch>
+
 <LocationMatch "^/+uploaded.*">
 AuthType LONCAPA
 Require valid-user
@@ -511,16 +503,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/remote>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonremote
-ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/pickauthor>
 AuthType LONCAPA
 Require valid-user
@@ -1293,6 +1275,7 @@ ErrorDocument	  500 /adm/errorhandler
 <LocationMatch "^/adm/coursecatalog">
 SetHandler perl-script
 PerlHandler Apache::coursecatalog
+PerlAccessHandler      Apache::publiccheck
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
@@ -1462,7 +1445,7 @@ PerlSetVar       lonFontsDir     /home/h
 # - 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
+PerlSetVar       lonBrowsDet  explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:9999&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
 
 PerlSetVar       lonTextBrowsers windows\s+ce:lynx
 PerlSetVar       lonScansDir  /home/httpd/scantron
@@ -1548,9 +1531,6 @@ PerlSetVar SSLEmail     certificate@lon-
 #-------------------------------------------------------------------------
 
 
-# ====================================== Include support for SSL rewrites
-
-Include conf/loncapa_rewrite.conf
 
 
 # ====================================== Include machine-specific configuration