summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlink <link@localhost>2001-05-26 06:05:56 +0000
committerlink <link@localhost>2001-05-26 06:05:56 +0000
commit63271c3a712063468113897e7f2da0de775427ee (patch)
tree78cac3943795cb7f62d028003947ecdecdfda845
parentec99d07a35f2bb9f75d3752be23160ddad18b98b (diff)
downloadmarkup-validator-63271c3a712063468113897e7f2da0de775427ee.zip
markup-validator-63271c3a712063468113897e7f2da0de775427ee.tar.gz
markup-validator-63271c3a712063468113897e7f2da0de775427ee.tar.bz2
Take care of some TODO items and kill a few warnings.
* Handle ISO-8859-8-I <URL:http://lists.w3.org/Archives/Public/www-validator/2001AprJun/0018.html> * Add support for text/vnd.wap.wml <URL:http://lists.w3.org/Archives/Public/www-validator/2001AprJun/0016.html> * Make various URIs configurable <URL:http://lists.w3.org/Archives/Public/www-validator/2001JanMar/0222.html> * Add DOCTYPE selection to file-upload.html (Duh!). Thanks Peter! * Unbreak bogus upload "fixes" from 1.94. * Kill undef() warnings with charset comparisons. (This has probably broken charset handling Yet Again; *bet* on it!) * Add alias for iso-8859-1-windows-3.1-latin-1. You're welcome, Bruce. :-)
-rwxr-xr-xhtdocs/file-upload.html16
-rwxr-xr-xhtdocs/todo.html20
-rwxr-xr-xhttpd/cgi-bin/check16
3 files changed, 27 insertions, 25 deletions
diff --git a/htdocs/file-upload.html b/htdocs/file-upload.html
index f84e77c..a539531 100755
--- a/htdocs/file-upload.html
+++ b/htdocs/file-upload.html
@@ -33,7 +33,19 @@
</p>
<form method="post" enctype="multipart/form-data" action="/check">
- File: <input type="file" name="uploaded_file" size="50" />
+ File: <input type="file" name="uploaded_file" size="50" /><br />
+ Document type:
+ <select name="doctype">
+ <option value="Inline">(specified inline)</option>
+ <option>XHTML 1.0 Strict</option>
+ <option>XHTML 1.0 Transitional</option>
+ <option>XHTML 1.0 Frameset</option>
+ <option>HTML 4.01 Strict</option>
+ <option>HTML 4.01 Transitional</option>
+ <option>HTML 4.01 Frameset</option>
+ <option>HTML 3.2</option>
+ <option>HTML 2.0</option>
+ </select>
<table cellpadding="0" cellspacing="0">
<!--
<tr>
@@ -83,7 +95,7 @@
src="http://validator.w3.org/images/vxhtml10" height="31" width="88"
align="right" border="0" alt="Valid XHTML 1.0!" /></a>
<a href="/feedback.html">Gerald Oskoboiny</a><br />
- $Date: 2001-04-20 23:46:57 $
+ $Date: 2001-05-26 06:05:56 $
</address>
</body>
diff --git a/htdocs/todo.html b/htdocs/todo.html
index df1091a..31a8257 100755
--- a/htdocs/todo.html
+++ b/htdocs/todo.html
@@ -8,7 +8,7 @@
W3C HTML Validation Service, To Do List">
<meta name="description" content="To Do List for W3C's Validation Service.">
<meta name="revision"
- content="$Id: todo.html,v 1.37 2001-04-17 04:19:43 link Exp $">
+ content="$Id: todo.html,v 1.38 2001-05-26 06:05:56 link Exp $">
</head>
<body bgcolor="#FFFFFF" text="#000000" link="#0000ee" vlink="#551a8b">
@@ -44,7 +44,7 @@
href="http://validator.w3.org/check?uri=http://www.w3.org/2001/01/xml-latin1.html;ss">this
doc</a> is invalid, but not reported as such
- <li> add a textarea for testing short HTML fragments
+ <li>Finish up the textarea for testing short HTML fragments.</li>
<li> add a "fix my HTML for me" option using <a
href="http://www.w3.org/People/Raggett/tidy/">tidy</a>.
@@ -162,28 +162,14 @@
<li> issue PICS labels for documents that do/don't conform?
or for editing tools that don't conform?
- <li>Handle ISO-8859-8-I (cf. <a href="http://lists.w3.org/Archives/Public/www-validator/2001AprJun/0018.html">this</a>
- message from <a href="mailto:ticker@newmail.net">Udi Wertheimer</a>.
- Thanks Udi!)</li>
-
- <li>Add support for text/vnd.wap.wml (cf. <a href="http://lists.w3.org/Archives/Public/www-validator/2001AprJun/0016.html">this</a>
- message from <a href="mailto:tkinias@asu.edu">Thanasis Kinias</a>. Thanks Thanasis!)</li>
-
<li>Add support for https:// (TLS/SSL).</li>
<li>Figure out what's going on with <a href="http://lists.w3.org/Archives/Public/www-validator/2001JanMar/0150.html">this</a>.
(Thanks to <a href="mailto:marie@voyager.atc.fhda.edu">Marie Taylor-Harper</a> for catching this!)</li>
- <li>Add DOCTYPE selection to <a href="file-upload.html">file-upload.html</a>
- (Duh!). (Thanks to <a href="mailto:PeterF@SystolicNetworks.com">Peter
- Foti</a> for catching this!)</li>
-
<li>Pay attention to Accept-Charset (cf. <a href="http://lists.w3.org/Archives/Public/www-validator/2001JanMar/0255.html">this</a>
message from "brewhaha").</li>
- <li>Make various URIs configurable (cf. <a href="http://lists.w3.org/Archives/Public/www-validator/2001JanMar/0222.html">this</a>
- message from <a href="mailto:gilkison@one.net">Brian Gilkison</a>. Thanks Brian!)</li>
-
<li>Clarify the wording regarding valid characters in <a href="docs/errors.html#bad-char">errors.html</a> (cf. <a href="http://lists.w3.org/Archives/Public/www-validator/2001AprJun/0049.html">this</a>
message from <a href="mailto:clemens.radl@uni-tuebingen.de">Clemens Radl</a>. Thanks Clemens!)</li>
@@ -196,7 +182,7 @@
src="http://validator.w3.org/images/vh40" height=31 width=88
align=right border=0 alt="Valid W3C HTML 4.0!"></a>
<a href="/feedback.html">Gerald Oskoboiny</A><br>
- $Date: 2001-04-17 04:19:43 $
+ $Date: 2001-05-26 06:05:56 $
</address>
</body>
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index fb71d11..89411a0 100755
--- a/httpd/cgi-bin/check
+++ b/httpd/cgi-bin/check
@@ -8,7 +8,7 @@
# This source code is available under the license at:
# http://www.w3.org/Consortium/Legal/copyright-software
#
-# $Id: check,v 1.100 2001-05-22 23:59:58 duerst Exp $
+# $Id: check,v 1.101 2001-05-26 06:05:56 link Exp $
#
# We need Perl 5.004.
@@ -75,9 +75,9 @@ my $element_ref = 'http://www.htmlhelp.com/reference/html40/';
#
# Strings
-$VERSION = q$Revision: 1.100 $;
+$VERSION = q$Revision: 1.101 $;
$VERSION =~ s/Revision: ([\d\.]+) /$1/;
-$DATE = q$Date: 2001-05-22 23:59:58 $;
+$DATE = q$Date: 2001-05-26 06:05:56 $;
$MAINTAINER = 'gerald@w3.org';
$NOTICE = ''; # "<p><strong>Note: This service will be ...</strong>";
@@ -141,7 +141,7 @@ if ($q->param('url') and not $q->param('uri')) {
#
# Supercede URI with an uploaded file.
if ($q->param('uploaded_file')) {
- &redirect_to_home_page unless length($q->param('uri')); # Must have filename.
+ &redirect_to_home_page unless length($q->param('uploaded_file')); # Must have filename.
$q->param('uri', 'upload://' . $q->param('uploaded_file'));
}
@@ -404,6 +404,9 @@ if ( $File->{Charset} eq 'utf-8'
# workaround for windows-nnnn charsets missing from glibc<2.2
my $temp_charset = $File->{Charset};
$temp_charset =~ s/^windows-(\d+)$/CP$1/i;
+ # workaround for iso-8859-8-i charset and Windows 3.1 cruft.
+ $temp_charset = 'iso-8859-8' if $temp_charset =~ m(iso-8859-8-i)i;
+ $temp_charset = 'windows-1252' if $temp_charset =~ m(iso-8859-1-Windows-3.1-Latin-1)i;
eval {my $c = Text::Iconv->new($temp_charset, 'utf-8')};
if (not $@) {
my $c = Text::Iconv->new($temp_charset, 'utf-8');
@@ -1355,7 +1358,7 @@ sub handle_uri {
}
&clean_up_and_exit;
}
-
+
my($type, $charset) = &parse_content_type($res->header('Content-Type'));
my $lastmod = undef;
@@ -1408,7 +1411,8 @@ sub handle_frag {
# Parse a Content-Type and parameters. Return document type and charset.
sub parse_content_type {
my $Content_Type = shift;
- my ($charset, $type);
+ my $charset = '';
+ my $type = '';
my($ct, @param) = split /\s*;\s*/, lc $Content_Type;