- From: Olivier Thereaux via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 21 Sep 2005 08:51:36 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv25538
Modified Files:
check
Log Message:
porting from branch 1.432.2.3
fixing the "no character encoding found"
warning when validating via direct input
http://www.w3.org/Bugs/Public/show_bug.cgi?id=1833
Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -d -r1.453 -r1.454
--- check 11 Sep 2005 12:29:46 -0000 1.453
+++ check 21 Sep 2005 08:51:34 -0000 1.454
@@ -938,6 +938,8 @@
$File->{Size} = scalar $res->content_length;
$File->{URI} = scalar $res->request->uri->canonical;
$File->{'Is Upload'} = FALSE;
+ $File->{'Direct Input'} = FALSE;
+
return $File;
}
@@ -966,6 +968,7 @@
$File->{Size} = $q->http('Content-Length');
$File->{URI} = "$f";
$File->{'Is Upload'} = TRUE;
+ $File->{'Direct Input'} = FALSE;
return $File;
}
@@ -984,7 +987,8 @@
$File->{ContentType} = ''; # @@TODO?
$File->{URI} = 'upload://Form Submission';
$File->{'Is Upload'} = TRUE;
-
+ $File->{'Direct Input'} = TRUE;
+ $File->{Charset}->{HTTP} = "utf-8"; # by default, the form accepts utf-8 chars
return $File;
}
@@ -1526,7 +1530,7 @@
W18_xml => $File->{Charset}->{XML},
W18_use => $File->{Charset}->{Use},
});
- } elsif (charset_not_equal($File->{Charset}->{HTTP}, $File->{Charset}->{META})) {
+ } elsif (&conflict($File->{Charset}->{HTTP}, $File->{Charset}->{META}) and not ($File->{'Direct Input'})) {
&add_warning('W19', {
W19_http => $File->{Charset}->{HTTP},
W19_meta => $File->{Charset}->{META},
Received on Wednesday, 21 September 2005 08:51:44 UTC