summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbjoern <bjoern@localhost>2005-09-25 00:13:33 +0000
committerbjoern <bjoern@localhost>2005-09-25 00:13:33 +0000
commit3a4076bee211e299a8d708d7a3d3b8a271d14b5c (patch)
tree2391867cdd8a8b561ac4ed21fca2414ecc4923cf
parent49706b58a822ac054c426fd263b5c3b11d7e7cff (diff)
downloadmarkup-validator-3a4076bee211e299a8d708d7a3d3b8a271d14b5c.zip
markup-validator-3a4076bee211e299a8d708d7a3d3b8a271d14b5c.tar.gz
markup-validator-3a4076bee211e299a8d708d7a3d3b8a271d14b5c.tar.bz2
someone should be more careful when merging patches...
-rwxr-xr-xhttpd/cgi-bin/check6
1 files changed, 3 insertions, 3 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index c278e93..95dc1dd 100755
--- a/httpd/cgi-bin/check
+++ b/httpd/cgi-bin/check
@@ -9,7 +9,7 @@
# This source code is available under the license at:
# http://www.w3.org/Consortium/Legal/copyright-software
#
-# $Id: check,v 1.454 2005-09-21 08:51:34 ot Exp $
+# $Id: check,v 1.455 2005-09-25 00:13:33 bjoern Exp $
#
# Disable buffering on STDOUT!
@@ -175,7 +175,7 @@ Directory not readable (permission denied): @_r
#
# Strings
- $VERSION = q$Revision: 1.454 $;
+ $VERSION = q$Revision: 1.455 $;
$VERSION =~ s/Revision: ([\d\.]+) /$1/;
#
@@ -1530,7 +1530,7 @@ sub charset_conflicts {
W18_xml => $File->{Charset}->{XML},
W18_use => $File->{Charset}->{Use},
});
- } elsif (&conflict($File->{Charset}->{HTTP}, $File->{Charset}->{META}) and not ($File->{'Direct Input'})) {
+ } elsif (charset_not_equal($File->{Charset}->{HTTP}, $File->{Charset}->{META}) and not ($File->{'Direct Input'})) {
&add_warning('W19', {
W19_http => $File->{Charset}->{HTTP},
W19_meta => $File->{Charset}->{META},