fix namespace locking problem when using with FastCGI servers

modules/namespaces.pl

@@ -55,6 +55,8 @@ our ($NamespacesMain, $NamespacesSelf, $NamespaceCurrent,
      $NamespaceRoot, $NamespaceSlashing, @NamespaceParameters,
      %Namespaces, $NamespacesRootDataDir);
 
+our ($OriginalSiteName, $OriginalInterWikiMoniker, $OriginalDataDir, $OriginalScriptName, $OriginalFullUrl, $OriginalStaticDir, $OriginalStaticUrl, $OriginalWikiDescription);
+
 $NamespacesMain = 'Main'; # to get back to the main namespace
 $NamespacesSelf = 'Self'; # for your own namespace
 $NamespaceCurrent = '';   # the current namespace, if any
@@ -104,6 +106,23 @@ sub GetNamespace {
 }
 
 sub NamespacesInitVariables {
+  $OriginalSiteName //= $SiteName;
+  $SiteName = $OriginalSiteName;
+  $OriginalInterWikiMoniker //= $InterWikiMoniker;
+  $InterWikiMoniker = $OriginalInterWikiMoniker;
+  $OriginalDataDir //= $DataDir;
+  $DataDir = $OriginalDataDir;
+  $OriginalScriptName //= $ScriptName;
+  $ScriptName = $OriginalScriptName;
+  $OriginalFullUrl //= $FullUrl;
+  $FullUrl = $OriginalFullUrl;
+  $OriginalStaticDir //= $StaticDir;
+  $StaticDir = $OriginalStaticDir;
+  $OriginalStaticUrl //= $StaticUrl;
+  $StaticUrl = $OriginalStaticUrl;
+  $OriginalWikiDescription //= $WikiDescription;
+  $WikiDescription = $OriginalWikiDescription;
+
   %Namespaces = ();
   # Do this before changing the $DataDir and $ScriptName
   if ($UsePathInfo) {
@@ -129,20 +148,24 @@ sub NamespacesInitVariables {
     $SiteName   .= ' ' . NormalToFree($NamespaceCurrent);
     $InterWikiMoniker = $NamespaceCurrent;
     $DataDir    .= '/' . $NamespaceCurrent;
-    $PageDir     = "$DataDir/page";
+  }
-    $KeepDir     = "$DataDir/keep";
+  $PageDir     = "$DataDir/page";
-    $RefererDir  = "$DataDir/referer";
+  $KeepDir     = "$DataDir/keep";
-    $TempDir     = "$DataDir/temp";
+  $RefererDir  = "$DataDir/referer";
-    $LockDir     = "$TempDir/lock";
+  $TempDir     = "$DataDir/temp";
-    $NoEditFile  = "$DataDir/noedit";
+  $LockDir     = "$TempDir/lock";
-    $RcFile      = "$DataDir/rc.log";
+  $NoEditFile  = "$DataDir/noedit";
-    $RcOldFile   = "$DataDir/oldrc.log";
+  $RcFile      = "$DataDir/rc.log";
-    $IndexFile   = "$DataDir/pageidx";
+  $RcOldFile   = "$DataDir/oldrc.log";
-    $VisitorFile = "$DataDir/visitors.log";
+  $IndexFile   = "$DataDir/pageidx";
-    $PermanentAnchorsFile = "$DataDir/permanentanchors";
+  $VisitorFile = "$DataDir/visitors.log";
-    # $ConfigFile -- shared
+  $PermanentAnchorsFile = "$DataDir/permanentanchors";
-    # $ModuleDir -- shared
+  # $ConfigFile -- shared
-    # $NearDir -- shared
+  # $ModuleDir -- shared
+  # $NearDir -- shared
+  if ($ns
+      and $ns ne $NamespacesMain
+      and $ns ne $NamespacesSelf) {
     $ScriptName .= '/' . UrlEncode($NamespaceCurrent);
     $FullUrl .= '/' . UrlEncode($NamespaceCurrent);
     $StaticDir .= '/' . $NamespaceCurrent; # from static-copy.pl