summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorot <ot@localhost>2007-08-15 01:33:30 +0000
committerot <ot@localhost>2007-08-15 01:33:30 +0000
commitff9397f6e22493bffec2598ebe3e10d585b4b0c0 (patch)
tree5929ef52774ff7d0c0337880f4c1cfc66d40105a
parentb7a5842a09a9e8beec3bd0f9f70411d74bf2a9c0 (diff)
downloadmarkup-validator-ff9397f6e22493bffec2598ebe3e10d585b4b0c0.zip
markup-validator-ff9397f6e22493bffec2598ebe3e10d585b4b0c0.tar.gz
markup-validator-ff9397f6e22493bffec2598ebe3e10d585b4b0c0.tar.bz2
silencing HTTP / XML decl charset mismatch warning in case of direct input mode
-rwxr-xr-xhttpd/cgi-bin/check7
1 files changed, 4 insertions, 3 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index 0a120e4..29a079e 100755
--- a/httpd/cgi-bin/check
+++ b/httpd/cgi-bin/check
@@ -14,7 +14,7 @@
# This source code is available under the license at:
# http://www.w3.org/Consortium/Legal/copyright-software
#
-# $Id: check,v 1.555 2007-08-07 02:32:49 ot Exp $
+# $Id: check,v 1.556 2007-08-15 01:33:30 ot Exp $
#
# Disable buffering on STDOUT!
@@ -186,7 +186,7 @@ Directory not readable (permission denied): @_r
#
# Strings
- $VERSION = q$Revision: 1.555 $;
+ $VERSION = q$Revision: 1.556 $;
$VERSION =~ s/Revision: ([\d\.]+) /$1/;
#
@@ -2094,7 +2094,8 @@ sub charset_conflicts {
#
# Add a warning if there was charset info conflict (HTTP header,
# XML declaration, or <meta> element).
- if (charset_not_equal($File->{Charset}->{HTTP}, $File->{Charset}->{XML})) {
+ # filtering out some of the warnings in direct input mode where HTTP encoding is a "fake"
+ if ((charset_not_equal($File->{Charset}->{HTTP}, $File->{Charset}->{XML})) and not ($File->{'Direct Input'})) {
&add_warning('W18', {
W18_http => $File->{Charset}->{HTTP},
W18_xml => $File->{Charset}->{XML},