Item13186: Hijack this task to fix the script verify routine

VERISON is an object, so we have to stringify it, or the JSON code crashes. The path checking needed changes in order of tests.
foswiki · Jan 9, 2015 · 50e50d9 · 50e50d9
1 parent 7a4e66b
commit 50e50d9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/core/lib/Foswiki/Configure/Wizards/ScriptHash.pm b/core/lib/Foswiki/Configure/Wizards/ScriptHash.pm
@@ -131,29 +131,36 @@ sub verify {
             last;
         }
 
-        my $target = $Foswiki::cfg{ScriptUrlPaths}{$script}
-          || "$Foswiki::cfg{ScriptUrlPath}/$script"
-          . ( $Foswiki::cfg{ScriptSuffix} || '' );
-
-        if ( $info->{SCRIPT_NAME} eq $target ) {
-            $reporter->NOTE("Server received the expected path (=$target=)");
+        my $target = $Foswiki::cfg{ScriptUrlPaths}{$script};
+        unless ( defined $target ) {
+            $target = "$Foswiki::cfg{ScriptUrlPath}/$script"
+              . ( $Foswiki::cfg{ScriptSuffix} || '' );
         }
-        elsif ( $script eq 'view' ) {
+        my $ptarget = ($target) ? $target : 'empty';
+
+        if ( $script eq 'view' ) {
             if ( $info->{SCRIPT_NAME} eq $Foswiki::cfg{ScriptUrlPath} ) {
                 $reporter->NOTE(
 "Server received =$info->{SCRIPT_NAME}=, which is the value of {ScriptUrlPaths}{$script}.  This indicates that short(er) URLs are active and functioning correctly."
                 );
             }
+            elsif ( $info->{SCRIPT_NAME} eq $target ) {
+                $reporter->NOTE(
+                    "Server received the expected path: (=$ptarget=) ");
+            }
             else {
                 $reporter->ERROR(
-"Server received =$info->{SCRIPT_NAME}=, but the expected path is =$Foswiki::cfg{ScriptUrlPath}=.
-Changing {ScriptUrlPaths}{view} to =$info->{SCRIPT_NAME}= will probably correct this error. (Server may be configured for Shorter URLs.)"
+"Server received =($info->{SCRIPT_NAME})=, but the configured path to =view= is =($Foswiki::cfg{ScriptUrlPath})=.
+Changing {ScriptUrlPaths}{view} to =($info->{SCRIPT_NAME})= will probably correct this error. (Server may be configured for Shorter URLs.)"
                 );
             }
         }
+        elsif ( $info->{SCRIPT_NAME} eq $target ) {
+            $reporter->NOTE("Server received the expected path: (=$ptarget=) ");
+        }
         else {
             $reporter->ERROR(
-"Server received =$info->{SCRIPT_NAME}=, but the expected path is =$target=.
+"Server received (=$info->{SCRIPT_NAME}=), but the expected path is =($ptarget)=.
 The correct setting for $keys is probably =$info->{SCRIPT_NAME}=.  (Server may be configured for Shorter URLs.)"
             );
         }

diff --git a/core/lib/Foswiki/UI.pm b/core/lib/Foswiki/UI.pm
@@ -236,11 +236,13 @@ sub handleRequest {
     if ( $req->header('X-Foswiki-Tickle') ) {
         my $data = {
             SCRIPT_NAME => $ENV{SCRIPT_NAME},
-            VERSION     => $Foswiki::VERSION,
+            VERSION     => $Foswiki::VERSION->stringify(),
             RELEASE     => $Foswiki::RELEASE,
         };
         my $res = new Foswiki::Response();
         $res->header( -type => 'application/json', -status => '200' );
+
+        # Need to allow_blessed since VERSION is a version object.
         my $d = JSON->new->allow_nonref->encode($data);
         $res->print($d);
         return $res;