[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /auth lontokacc.pm

[www]

www		Fri Aug  1 13:25:40 2003 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
    /loncom/auth	lontokacc.pm 
  Log:
  Problem with lontokacc running twice on high school machines if cleanup
  was registered dynamically.
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.57 loncom/loncapa_apache.conf:1.58
--- loncom/loncapa_apache.conf:1.57	Thu Jul 17 11:50:46 2003
+++ loncom/loncapa_apache.conf	Fri Aug  1 13:25:40 2003
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.57 2003/07/17 15:50:46 www Exp $
+## $Id: loncapa_apache.conf,v 1.58 2003/08/01 17:25:40 www Exp $
 ##
 
 #
@@ -53,6 +53,7 @@
 
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
+PerlCleanupHandler	Apache::lontokacc::removefile
 </LocationMatch>
 
 <LocationMatch "^/+uploaded.*">
Index: loncom/auth/lontokacc.pm
diff -u loncom/auth/lontokacc.pm:1.8 loncom/auth/lontokacc.pm:1.9
--- loncom/auth/lontokacc.pm:1.8	Fri Aug  1 11:46:10 2003
+++ loncom/auth/lontokacc.pm	Fri Aug  1 13:25:40 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for User File Transfers
 #
-# $Id: lontokacc.pm,v 1.8 2003/08/01 15:46:10 www Exp $
+# $Id: lontokacc.pm,v 1.9 2003/08/01 17:25:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,7 +45,6 @@
         return FORBIDDEN;
     }
     if ($reqhost eq 'localhost.localdomain') {
-       $r->register_cleanup(\&removefile);
        return OK;
     }
     my $readline;
@@ -59,7 +58,6 @@
        while ($readline=<$fh>) {
           my ($id,$domain,$role,$name,$ip)=split(/:/,$readline);
           if ($name =~ /$reqhost/i) {
-             $r->register_cleanup(\&removefile); 
              return OK; 
           }
        }