summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xhttpd/cgi-bin/check8
-rw-r--r--share/templates/en_US/fatal-error.tmpl10
-rw-r--r--share/templates/en_US/soap_fault.tmpl6
3 files changed, 22 insertions, 2 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index eb3223d..6be50fe 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.575 2007-10-09 16:37:05 ville Exp $
+# $Id: check,v 1.576 2007-10-19 19:37:39 ville Exp $
#
# Disable buffering on STDOUT!
@@ -186,7 +186,7 @@ Directory not readable (permission denied): @_r
#
# Strings
- $VERSION = q$Revision: 1.575 $;
+ $VERSION = q$Revision: 1.576 $;
$VERSION =~ s/Revision: ([\d\.]+) /$1/;
#
@@ -1337,10 +1337,14 @@ sub handle_uri {
} else {
$File->{'Error Flagged'} = TRUE;
+ my $warning = $res->header("Client-Warning");
+ $warning = undef if ($warning && $warning =~ /Internal response/i);
+
$File->{Templates}->{Error}->param(fatal_http_error => TRUE);
$File->{Templates}->{Error}->param(fatal_http_uri => $uri->as_string);
$File->{Templates}->{Error}->param(fatal_http_code => $res->code);
$File->{Templates}->{Error}->param(fatal_http_msg => $res->message);
+ $File->{Templates}->{Error}->param(fatal_http_warn => $warning);
$File->{Templates}->{Error}->param(fatal_http_dns => TRUE)
if $res->code == 500;
}
diff --git a/share/templates/en_US/fatal-error.tmpl b/share/templates/en_US/fatal-error.tmpl
index 6794c12..ce7f1f2 100644
--- a/share/templates/en_US/fatal-error.tmpl
+++ b/share/templates/en_US/fatal-error.tmpl
@@ -114,6 +114,16 @@
domain records are correct</a>, or ask your hosting company to do so.
</p>
</TMPL_IF>
+ <TMPL_IF NAME="fatal_http_warn">
+ <p>
+ More information about why this is happening may be available from
+ warnings reported by the validator's HTTP (and other protocol) client
+ library:
+ </p>
+ <blockquote>
+ <p><code><TMPL_VAR NAME="fatal_http_warn" ESCAPE="HTML"></code></p>
+ </blockquote>
+ </TMPL_IF>
</li>
</TMPL_IF>
diff --git a/share/templates/en_US/soap_fault.tmpl b/share/templates/en_US/soap_fault.tmpl
index bc7bc25..746218b 100644
--- a/share/templates/en_US/soap_fault.tmpl
+++ b/share/templates/en_US/soap_fault.tmpl
@@ -108,6 +108,12 @@ X-W3C-Validator-Errors: <TMPL_VAR NAME="valid_errors_num"></TMPL_IF>
also want to <a href="http://www.squish.net/dnscheck/">check that your
domain records are correct</a>, or ask your hosting company to do so.
</TMPL_IF>
+ <TMPL_IF NAME="fatal_http_warn">
+ More information about why this is happening may be available from
+ warnings reported by the validator's HTTP (and other protocol) client
+ library:
+ <TMPL_VAR NAME="fatal_http_warn" ESCAPE="HTML">
+ </TMPL_IF>
</m:errordetail>
</env:Detail>
</TMPL_IF>