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

[raeburn]

raeburn		Mon May 17 20:29:02 2010 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom	loncapa_apache.conf 
  Log:
  - Backport 1.194, 1.195. 
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.192 loncom/loncapa_apache.conf:1.192.2.1
--- loncom/loncapa_apache.conf:1.192	Mon Feb 22 22:53:40 2010
+++ loncom/loncapa_apache.conf	Mon May 17 20:29:02 2010
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.192 2010/02/22 22:53:40 droeschl Exp $
+## $Id: loncapa_apache.conf,v 1.192.2.1 2010/05/17 20:29:02 raeburn Exp $
 ##
 
 #
@@ -105,17 +105,24 @@
 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
@@ -1285,7 +1292,6 @@
 <LocationMatch "^/adm/coursecatalog">
 SetHandler perl-script
 PerlHandler Apache::coursecatalog
-PerlAccessHandler      Apache::publiccheck
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>