[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /lonnet/perl lonnet.pm

[www]

www		Tue Oct 26 13:20:12 2004 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  Bug #3501: actually catch overload errors and tell people to come back
  later.
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.98 loncom/loncapa_apache.conf:1.99
--- loncom/loncapa_apache.conf:1.98	Tue Oct 26 11:03:08 2004
+++ loncom/loncapa_apache.conf	Tue Oct 26 13:20:08 2004
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.98 2004/10/26 15:03:08 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.99 2004/10/26 17:20:08 www Exp $
 ##
 
 #
@@ -188,6 +188,7 @@
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 # ------------------------------------------------------------------------- RAT
@@ -241,6 +242,7 @@
 <LocationMatch "^/+(res|\~|public|uploaded|adm).*\.meta$">
 SetHandler perl-script
 PerlHandler Apache::lonmeta
+ErrorDocument     413 /adm/overloaded.txt
 </LocationMatch>
 
 <LocationMatch "^/adm/bombs/">
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.553 loncom/lonnet/perl/lonnet.pm:1.554
--- loncom/lonnet/perl/lonnet.pm:1.553	Tue Oct 26 11:15:18 2004
+++ loncom/lonnet/perl/lonnet.pm	Tue Oct 26 13:20:09 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.553 2004/10/26 15:15:18 albertel Exp $
+# $Id: lonnet.pm,v 1.554 2004/10/26 17:20:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -461,7 +461,7 @@
     if ($overload>0) {
 	$r->err_headers_out->{'Retry-After'}=$overload;
         $r->log_error('Overload of '.$overload.' on '.$checkserver);
-        return 409;
+        return 413;
     }    
     return '';
 }