validator/httpd/cgi-bin check,1.763,1.764

Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv26568/httpd/cgi-bin

Modified Files:
	check 
Log Message:
Set output mode earlier so we can choose the correct error template for URI
related fatal errors.


Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.763
retrieving revision 1.764
diff -u -d -r1.763 -r1.764
--- check	26 Jan 2010 19:40:29 -0000	1.763
+++ check	26 Jan 2010 20:16:38 -0000	1.764
@@ -350,7 +350,6 @@
 $File->{Opt}->{'Prefill Doctype'} = $q->param('prefill_doctype') || 'html401';
 $File->{Opt}->{Charset} = lc($q->param('charset') || '');
 $File->{Opt}->{DOCTYPE} = $q->param('doctype') || '';
-$File->{Opt}->{Output}  = $q->param('output')  || 'html';
 
 $File->{Opt}->{'User Agent'} =
     $q->param('user-agent') &&
@@ -2670,6 +2669,9 @@
     my $u = $q->param('uri');
     $q->param('uri', "http://$u") if $u && $u =~ m(^www)i;
 
+    # Set output mode; needed in get_error_template if we end up there.
+    $File->{Opt}->{Output} = $q->param('output') || 'html';
+
     # Issue a redirect for uri=referer.
     if ($q->param('uri') and $q->param('uri') eq 'referer') {
         if ($q->referer) {

Received on Tuesday, 26 January 2010 20:16:41 UTC