diff options
| -rwxr-xr-x | htdocs/docs/install.html | 2 | ||||
| -rwxr-xr-x | httpd/cgi-bin/check | 8 | ||||
| -rw-r--r-- | misc/bundle/Makefile.PL | 2 | ||||
| -rw-r--r-- | misc/bundle/lib/Bundle/W3C/Validator.pm | 2 | ||||
| -rw-r--r-- | share/templates/en_US/valid.tmpl | 5 |
5 files changed, 15 insertions, 4 deletions
diff --git a/htdocs/docs/install.html b/htdocs/docs/install.html index 5172a63..a29e76f 100755 --- a/htdocs/docs/install.html +++ b/htdocs/docs/install.html @@ -174,7 +174,7 @@ install Bundle::W3C::Validator <dd> Interface to the <a href="#install-prereq-sp">OpenSP parser</a>. </dd> - <dt><a href="http://search.cpan.org/dist/URI/">URI</a></dt> + <dt><a href="http://search.cpan.org/dist/URI/">URI</a> >= 1.53</dt> <dd> Library to handle URIs and escaping special characters in them. </dd> diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 8cb4d06..8725ace 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -59,7 +59,7 @@ use HTTP::Request qw(); use HTTP::Headers::Auth qw(); # Needs to be imported after other HTTP::*. use JSON 2.00 qw(); use SGML::Parser::OpenSP 0.991 qw(); -use URI qw(); +use URI 1.53 qw(); # Need 1.53 for secure() use URI::Escape qw(uri_escape); use URI::file; use URI::Heuristic qw(); @@ -1430,6 +1430,12 @@ sub prep_template ($$) $T->param(file_uri => $File->{URI}); # + # HTTPS note? + $T->param(file_https_note => $File->{'Is Upload'} || + $File->{'Direct Input'} || + URI->new($File->{URI})->secure()); + + # # Set URL for page title. $T->param(page_title_url => $File->{URI}); diff --git a/misc/bundle/Makefile.PL b/misc/bundle/Makefile.PL index eefde56..0494ebf 100644 --- a/misc/bundle/Makefile.PL +++ b/misc/bundle/Makefile.PL @@ -36,7 +36,7 @@ WriteMakefile( "Net::IP" => 0, "SGML::Parser::OpenSP" => 0.991, "Socket" => 0, - "URI" => 0, + "URI" => 1.53, "URI::Escape" => 0, "URI::file" => 0, "URI::Heuristic" => 0, diff --git a/misc/bundle/lib/Bundle/W3C/Validator.pm b/misc/bundle/lib/Bundle/W3C/Validator.pm index de3a7db..3a0b082 100644 --- a/misc/bundle/lib/Bundle/W3C/Validator.pm +++ b/misc/bundle/lib/Bundle/W3C/Validator.pm @@ -46,7 +46,7 @@ C<perl -MCPAN -e "install Bundle::W3C::Validator"> Net::hostent SGML::Parser::OpenSP 0.991 Socket - URI + URI 1.53 URI::Escape URI::file URI::Heuristic diff --git a/share/templates/en_US/valid.tmpl b/share/templates/en_US/valid.tmpl index 3ae80ab..818aebc 100644 --- a/share/templates/en_US/valid.tmpl +++ b/share/templates/en_US/valid.tmpl @@ -95,6 +95,11 @@ If you like, you can download a copy of the icons to keep in your local web directory, and change the HTML fragment above to reference your local image rather than the one on this server. + <TMPL_IF NAME="file_https_note"> + See also our help items related to documents transferred over secure + protocols for these <a href="docs/help.html#icon-https">icons</a> and + the <a href="docs/help.html#faq-referer">"uri=referer" feature</a>. + </TMPL_IF> </p> </TMPL_IF> <TMPL_UNLESS NAME="is_upload"> |