X-Git-Url: http://git.shiar.net/perl/plp/.git/blobdiff_plain/9b76d38ad3dc8f7135e5c2b1594e6815790808bc..HEAD:/eg/plpinfo.plp

diff --git a/eg/plpinfo.plp b/eg/plpinfo.plp
index 9578327..e22ca84 100644
--- a/eg/plpinfo.plp
+++ b/eg/plpinfo.plp
@@ -24,10 +24,11 @@
 use Config;
 printf "<tr><th>%s</th><td>%s</td></tr>\n", @$_ for (
 	["System"     => qx(uname -snrvm)],
-	["Server API" => "CGI/FastCGI - ".$PLP::interface], #TODO
-	["Perl"       => join ".", map ord, split //, $^V],
-	["Build Date" => $Config{cf_time}],
-	["Debug Build" => $^P ? "yes" : "no"],
+	["Server API" => $PLP::interface ? $PLP::interface : "?"],
+	["Perl"       => sprintf '%vd', $^V],
+	["Perl API"   => $Config{api_versionstring} || "?"],
+	["Build Date" => $Config{cf_time} || "?"],
+	["Debug Build" => $^P ? "yes ($^P)" : "no"],
 	["Thread Safety" => $Config{usethreads} ? "enabled" : "disabled"],
 	["Include Path" => join "; ", @INC],
 );
@@ -40,13 +41,13 @@ printf "<tr><th>%s</th><td>%s</td></tr>\n", @$_ for (
 my %modules;
 s!/!::!g, s/\.pm$// and $modules{$_} = $_->VERSION || "" for keys %INC;
 printf "<tr><th>%s</th><td>%s</td></tr>\n", @$_ for (
-	["Modules" => join "<br>\n",
+	["Loaded Modules" => join "<br>\n",
 		map "$_ $modules{$_}", sort grep /^PLP/, keys %modules
 	],
-	["Debug Output" => join "; ",
+	["Debug Output" => join("; ",
 		$PLP::DEBUG & 1 ? "run-time errors" : (),
 		$PLP::DEBUG & 2 ? "headers" : (),
-	],
+	) || "disabled"],
 	["Caching" => $PLP::use_cache ? "on" : "off"], #TODO
 );
 :></table>
@@ -57,7 +58,7 @@ printf "<tr><th>%s</th><td>%s</td></tr>\n", @$_ for (
 <:
 s/(?<=,)/<wbr>/g for values %ENV; # allow breaks at commas (HTTP_ACCEPT*)
 printf("<tr><th>%s</th><td>%s</td></tr>\n",
-	$_, defined $ENV{$_} ? $ENV{$_} : "<i>no value</i>"
+	$_, defined $ENV{$_} ? EscapeHTML($ENV{$_}) : "<i>no value</i>"
 ) for sort keys %ENV;
 :></table>
 
@@ -65,9 +66,9 @@ printf("<tr><th>%s</th><td>%s</td></tr>\n",
 
 <table border="1">
 <:
-for my $var qw(get post cookies header) {
+for my $var (qw[ get post cookies header ]) {
 	printf("<tr><th>%s{'%s'}</th><td>%s</td></tr>\n",
-		$var, $_, defined $$var{$_} ? $$var{$_} : "<i>no value</i>"
+		$var, $_, defined $$var{$_} ? EscapeHTML($$var{$_}) : "<i>no value</i>"
 	) for sort keys %$var;
 }
 :></table>