improve plpinfo page

Fix version display in Perl >= 5.10: $^V no longer consists out of
single characters for each level.  Use the recommended practise of
formatting with sprintf (see perlvar) which seems to work in at least
5.6.1 (ie good enough).

Add 'Perl API' version analogous to 'PHP API' in phpinfo().
Some fallbacks if variables are empty or undefined.

diff --git a/eg/plpinfo.plp b/eg/plpinfo.plp
index 748d40c93690444f0c1f38a7111d8e66c257e7ed..9b3b704f204abd927f2d6ec87516ff2a3b6f4c16 100644 (file)
--- a/eg/plpinfo.plp
+++ b/eg/plpinfo.plp
@@ -25,9 +25,10 @@ use Config;
 printf "<tr><th>%s</th><td>%s</td></tr>\n", @$_ for (
        ["System"     => qx(uname -snrvm)],
        ["Server API" => $PLP::interface ? $PLP::interface : "?"],
-       ["Perl"       => join ".", map ord, split //, $^V],
-       ["Build Date" => $Config{cf_time}],
-       ["Debug Build" => $^P ? "yes" : "no"],
+       ["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>