[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /interface lonhelp.pm

www lon-capa-cvs@mail.lon-capa.org
Tue, 13 Jan 2004 19:43:42 -0000


www		Tue Jan 13 14:43:42 2004 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
    /loncom/interface	lonhelp.pm 
  Log:
  * Need to load environment before getting the language handle - so why not
  in the normal request cycle?
  * Should actually send out the header we made
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.67 loncom/loncapa_apache.conf:1.68
--- loncom/loncapa_apache.conf:1.67	Sun Dec 28 04:18:11 2003
+++ loncom/loncapa_apache.conf	Tue Jan 13 14:43:42 2004
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.67 2003/12/28 09:18:11 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.68 2004/01/13 19:43:42 www Exp $
 ##
 
 #
@@ -670,6 +670,7 @@
 </Location>
 
 <LocationMatch "^/adm/help/.*\.hlp$">
+PerlAccessHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelp
 </LocationMatch>
Index: loncom/interface/lonhelp.pm
diff -u loncom/interface/lonhelp.pm:1.12 loncom/interface/lonhelp.pm:1.13
--- loncom/interface/lonhelp.pm:1.12	Mon Dec 15 14:46:13 2003
+++ loncom/interface/lonhelp.pm	Tue Jan 13 14:43:42 2004
@@ -174,9 +174,6 @@
 	 $tex .= join('', <$file>);
      }
 
-     # get me my environment if it exists
-     &Apache::lonacc::handler($r);
-
      if ($ENV{'browser.mathml'}) {
 	 &Apache::loncommon::content_type($r,'text/xml');
 	 &tth::ttminit();
@@ -195,6 +192,7 @@
 	 }
      }
 
+     $r->send_http_header;
      $tex = render($tex, $docroot, $serverroot);
      serveTex($tex, $r);