Item12180: Update diagnostic to allow exception for forks of configure

git-svn-id: http://svn.foswiki.org/trunk@16429 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jan 21, 2013 · 3570510 · 3570510
1 parent 348c525
commit 3570510
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 1 deletion.
diff --git a/core/bin/configure b/core/bin/configure
@@ -23,7 +23,7 @@ our $VERSION = '3.0_001';
 sub log;
 
 END {
-    if ( exists $INC{'Foswiki.pm'} ) {
+    if ( exists $INC{'Foswiki.pm'} && !$Foswiki::configureFork ) {
         my $message =
 "Foswiki ERROR: Some module loaded Foswiki.pm into configure.  This is not permitted, and will cause unpredictable results, including corruption of the Foswiki configuration.  This is probably caused by a pluggable module, such as a checker, pluggable, or Foswiki Engine code that was inappropriately used (use, require) in configure.  This must be tracked-down and removed.\n";
         print STDERR $message;

diff --git a/core/lib/Foswiki/Configure.pm b/core/lib/Foswiki/Configure.pm
@@ -104,6 +104,9 @@ our $FALSE = 0;
 # under configure or the webserver.  Set by Dispatch.
 our $configureRunning;
 
+# Running in a fork of configure - safe to load Foswiki engine
+our $configureFork;
+
 # auth - authentication state
 our ( $newLogin, $session, );
 

diff --git a/core/lib/Foswiki/Configure/Checkers/CGISetup.pm b/core/lib/Foswiki/Configure/Checkers/CGISetup.pm
@@ -614,6 +614,7 @@ HERE
         }
         else {
             $Foswiki::cfg{ConfigurationFinished} = 1;
+            $Foswiki::configureFork = 1;
             eval 'require Foswiki';
             if ($@) {
                 $mess = $@;

diff --git a/core/lib/Foswiki/Configure/Checkers/EMAILADDRESS.pm b/core/lib/Foswiki/Configure/Checkers/EMAILADDRESS.pm
@@ -108,6 +108,7 @@ sub provideFeedback {
                     close $fh;
                 }
                 else {
+                    $Foswiki::configureFork = 1;
                     eval { print $this->_mailFork($keys); };
                     print $@ if ($@);
                     exit(0);

diff --git a/core/lib/Foswiki/Configure/UIs/EXTEND.pm b/core/lib/Foswiki/Configure/UIs/EXTEND.pm
@@ -47,6 +47,7 @@ sub install {
             close $fh;
         }
         else {
+            $Foswiki::configureFork = 1;
             eval { print _installFork(@_); };
             print $@ if ($@);
             exit(0);

diff --git a/core/lib/Foswiki/Configure/UIs/EXTENSIONS.pm b/core/lib/Foswiki/Configure/UIs/EXTENSIONS.pm
@@ -72,6 +72,7 @@ sub _getBuildStrings {
             close $fh;
         }
         else {
+            $Foswiki::configureFork = 1;
             eval {
                 require Foswiki;
                 require Foswiki::Plugins;