[LON-CAPA-cvs] cvs: loncom /xml run.pm

[albertel]

albertel		Thu Jan 29 13:46:25 2004 EDT

  Modified files:              
    /loncom/xml	run.pm 
  Log:
  - BUG#2656, wrong #of sceconds displayed when timingout
  
  
Index: loncom/xml/run.pm
diff -u loncom/xml/run.pm:1.42 loncom/xml/run.pm:1.43
--- loncom/xml/run.pm:1.42	Sat Nov  8 20:17:35 2003
+++ loncom/xml/run.pm	Thu Jan 29 13:46:25 2004
@@ -1,6 +1,6 @@
 package Apache::run;
 #
-# $Id: run.pm,v 1.42 2003/11/09 01:17:35 albertel Exp $
+# $Id: run.pm,v 1.43 2004/01/29 18:46:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,7 +62,7 @@
     } else {
 	if ($Apache::run::timeout) {
 	    $error = 'Code ran too long. It ran for more than '.
-		Apache->request->server->timeout.' seconds';
+		$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds';
 	}
 	&Apache::lonxml::error('substitution on <pre>'.
 			       &HTML::Entities::encode($expression).
@@ -96,7 +96,7 @@
     if (($Apache::run::timeout || $error ne '' || $innererror ne '') && !$hideerrors) {
 	if ($Apache::run::timeout) {
 	    $error = 'Code ran too long. It ran for more than '.
-		Apache->request->server->timeout.' seconds';
+		$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds';
 	}
 	my $errormsg='<pre>'.&HTML::Entities::encode($error).' '.
 	    &HTML::Entities::encode($innererror).