--- test/html-webhacc/cc.cgi 2007/11/05 09:33:52 1.23 +++ test/html-webhacc/cc.cgi 2007/11/18 05:30:03 1.25 @@ -62,7 +62,12 @@
Request URI
<@{[htescape $input->{request_uri}]}>
Document URI
-
<@{[htescape $input->{uri}]}>
+
<@{[htescape $input->{uri}]}> +
]; # no yet push @nav, ['#document-info' => 'Information']; @@ -74,7 +79,7 @@
<@{[htescape $input->{base_uri}]}>
Internet Media Type
@{[htescape $input->{media_type}]} - @{[$input->{media_type_overridden} ? '(overridden)' : '']}
+ @{[$input->{media_type_overridden} ? '(overridden)' : defined $input->{official_type} ? $input->{media_type} eq $input->{official_type} ? '' : '(sniffed; official type is: '.htescape ($input->{official_type}).')' : '(sniffed)']}
Character Encoding
@{[defined $input->{charset} ? ''.htescape ($input->{charset}).'' : '(none)']} @{[$input->{charset_overridden} ? '(overridden)' : '']}
@@ -93,7 +98,8 @@ if ($input->{media_type} eq 'text/html') { ($doc, $el) = print_syntax_error_html_section ($input, $result); - print_source_string_section (\($input->{s}), $input->{charset}); + print_source_string_section + (\($input->{s}), $input->{charset} || $doc->input_encoding); } elsif ({ 'text/xml' => 1, 'application/atom+xml' => 1, @@ -110,7 +116,7 @@ print_source_string_section (\($input->{s}), 'utf-8'); } else { ## TODO: Change HTTP status code?? - print_result_unknown_type_section ($input); + print_result_unknown_type_section ($input, $result); } if (defined $doc or defined $el) { @@ -143,7 +149,8 @@ ]; - for (qw/decode parse parse_xml parse_manifest check check_manifest/) { + for (qw/decode parse parse_html parse_xml parse_manifest + check check_manifest/) { next unless defined $time{$_}; open my $file, '>>', ".cc-$_.txt" or die ".cc-$_.txt: $!"; print $file $char_length, "\t", $time{$_}, "\n"; @@ -218,13 +225,7 @@ require Encode; require Whatpm::HTML; - - $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now. - my $time1 = time; - my $t = Encode::decode ($input->{charset}, $input->{s}); - $time{decode} = time - $time1; - print STDOUT qq[

Parse Errors

@@ -252,16 +253,24 @@ my $doc = $dom->create_document; my $el; - $time1 = time; if (defined $inner_html_element and length $inner_html_element) { + $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now. + my $time1 = time; + my $t = Encode::decode ($input->{charset}, $input->{s}); + $time{decode} = time - $time1; + $el = $doc->create_element_ns ('http://www.w3.org/1999/xhtml', [undef, $inner_html_element]); + $time1 = time; Whatpm::HTML->set_inner_html ($el, $t, $onerror); + $time{parse} = time - $time1; } else { - Whatpm::HTML->parse_string ($t => $doc, $onerror); + my $time1 = time; + Whatpm::HTML->parse_byte_string + ($input->{charset}, $input->{s} => $doc, $onerror); + $time{parse_html} = time - $time1; } - $time{parse} = time - $time1; - + print STDOUT qq[
]; return ($doc, $el); @@ -759,15 +768,28 @@ push @nav, ['#result-summary' => 'Result']; } # print_result_section -sub print_result_unknown_type_section ($) { - my $input = shift; +sub print_result_unknown_type_section ($$) { + my ($input, $result) = @_; + my $euri = htescape ($input->{uri}); print STDOUT qq[ -
-

Media type @{[htescape $input->{media_type}]} is not supported!

+
+

Errors

+ +
+
<$euri>
+
Not + supported: + Media type + @{[htescape $input->{media_type}]} + is not supported.
+
]; - push @nav, ['#result-summary' => 'Result']; + push @nav, ['#parse-errors' => 'Errors']; + add_error (char => {level => 'unsupported'} => $result); + add_error (syntax => {level => 'unsupported'} => $result); + add_error (structure => {level => 'unsupported'} => $result); } # print_result_unknown_type_section sub print_result_input_error_section ($) { @@ -981,9 +1003,6 @@ ## TODO: More strict parsing... my $ct = $res->header ('Content-Type'); - if (defined $ct and $ct =~ m#^([0-9A-Za-z._+-]+/[0-9A-Za-z._+-]+)#) { - $r->{media_type} = lc $1; - } if (defined $ct and $ct =~ /;\s*charset\s*=\s*"?([^\s;"]+)"?/i) { $r->{charset} = lc $1; $r->{charset} =~ tr/\\//d; @@ -994,9 +1013,22 @@ $r->{charset_overridden} = (not defined $r->{charset} or $r->{charset} ne $input_charset); $r->{charset} = $input_charset; - } + } + + ## TODO: Support for HTTP Content-Encoding $r->{s} = ''.$res->content; + + require Whatpm::ContentType; + ($r->{official_type}, $r->{media_type}) + = Whatpm::ContentType->get_sniffed_type + (get_file_head => sub { + return substr $r->{s}, 0, shift; + }, + http_content_type_byte => $ct, + has_http_content_encoding => + defined $res->header ('Content-Encoding'), + supported_image_types => {}); } else { $r->{uri} = $res->request->uri; $r->{request_uri} = $request_uri; @@ -1018,6 +1050,16 @@ $r->{charset} =~ s/\s+//g; $r->{charset} = 'utf-8' if $r->{charset} eq ''; $r->{header_field} = []; + + require Whatpm::ContentType; + ($r->{official_type}, $r->{media_type}) + = Whatpm::ContentType->get_sniffed_type + (get_file_head => sub { + return substr $r->{s}, 0, shift; + }, + http_content_type_byte => undef, + has_http_content_encoding => 0, + supported_image_types => {}); } my $input_format = $http->get_parameter ('i'); @@ -1084,4 +1126,4 @@ =cut -## $Date: 2007/11/05 09:33:52 $ +## $Date: 2007/11/18 05:30:03 $