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

[albertel]

albertel		Thu Apr  3 09:35:59 2003 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
    /loncom/xml	run.pm 
  Log:
  - shift to using a pervar timeout
  - add perlvar for scantron dir
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.42 loncom/loncapa_apache.conf:1.43
--- loncom/loncapa_apache.conf:1.42	Wed Apr  2 15:28:27 2003
+++ loncom/loncapa_apache.conf	Thu Apr  3 09:35:59 2003
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.42 2003/04/02 20:28:27 www Exp $
+## $Id: loncapa_apache.conf,v 1.43 2003/04/03 14:35:59 albertel Exp $
 ##
 
 #
@@ -25,7 +25,6 @@
 
 ServerAdmin korte@lite.msu.edu
 ExtendedStatus On
-
 #
 # LON-CAPA Section (extensions to srm.conf name space servicing)
 #
@@ -747,7 +746,8 @@
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
 PerlSetVar       lonBrowsDet  netscape:mozilla:msie:mozilla\/(\d+\.\d+)\s:9999:9999&explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1
 PerlSetVar       lonTextBrowsers opera:windows\s+ce:lynx
-
+PerlSetVar       lonScansDir  /home/httpd/scantron
+PerlSetVar       lonScriptTimeout 10
 # -----------------------------------------------------------------------------
 # NOTE: lonSqlAccess key is the password for the MySQL user
 # www@localhost.  This value must always be "localhostkey".
Index: loncom/xml/run.pm
diff -u loncom/xml/run.pm:1.34 loncom/xml/run.pm:1.35
--- loncom/xml/run.pm:1.34	Fri Mar 28 18:32:46 2003
+++ loncom/xml/run.pm	Thu Apr  3 09:35:59 2003
@@ -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.35 2003/04/03 14:35:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,7 +49,7 @@
     };
     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,7 +87,7 @@
     };
     my $innererror;
     eval {
-	alarm(Apache->request->server->timeout);
+	alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});
 	@result=$safeeval->reval($code);
 	$innererror=$@;
 	alarm(0);