--- loncom/xml/run.pm 2003/03/28 23:32:46 1.34
+++ loncom/xml/run.pm 2003/06/18 21:04:42 1.39
@@ -1,6 +1,6 @@
package Apache::run;
#
-# $Id: run.pm,v 1.34 2003/03/28 23:32:46 albertel Exp $
+# $Id: run.pm,v 1.39 2003/06/18 21:04:42 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -49,7 +49,7 @@ sub evaluate {
};
my $innererror;
eval {
- alarm(Apache->request->server->timeout);
+ alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
$safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
"\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
$innererror=$@;
@@ -87,13 +87,12 @@ sub run {
};
my $innererror;
eval {
- alarm(Apache->request->server->timeout);
+ alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
@result=$safeeval->reval($code);
$innererror=$@;
alarm(0);
};
my $error=$@;
- &Apache::lonxml::debug("run got $@");
if (($Apache::run::timeout || $error ne '' || $innererror ne '') && !$hideerrors) {
if ($Apache::run::timeout) {
$error = 'Code ran too long. It ran for more than '.
@@ -131,7 +130,7 @@ sub dump {
$symname.'{$_} } sort keys %'.
$symname.')').")"
}
- if ($line ne '') { $dump.=&HTML::Entities::encode($line)."
\n"; }
+ if ($line ne '') { $dump.=&HTML::Entities::encode($line)."
"; }
}
}
$dump.='';