Merge branch 'master' of https://github.com/foswiki/distro into Item1…

…4323
foswiki · Mar 23, 2017 · c32ce30 · c32ce30
2 parents 2cb7414 + 76adfee
commit c32ce30
Show file tree

Hide file tree

Showing 64 changed files with 1,164 additions and 722 deletions.
diff --git a/ConfigurePlugin/templates/configure.tmpl b/ConfigurePlugin/templates/configure.tmpl
@@ -52,7 +52,15 @@ configure.js script.
    <ol><li>x</li></ol>
    <button id="closeSearchButton">Close</button>
   </div>
-  <div id="root" class="main"><span class="splash">Loading ...</span></div>
+  <div id="root" class="main"><span class="splash">Loading ...</span>
+      If you are seeing this message, javascript may be blocked or failing to load. Verify that:
+      <ul><li>pub files are reachable and that the path is correct. (Current path is <tt>%PUBURLPATH%</tt>)
+      <ul style="list-style-type:none"><li>Hint: Is the Foswiki logo displayed above?</ul>
+      <li>javascript execution is enabled in the browser, and not blocked by a script blocker
+      <li>there are no javascript errors that are preventing execution, and
+      <li>if pub files require authentication to access, authenticate and try again.
+      </ul>
+  </div>
   <!-- Dialogs and messages -->
   <div id="auth_prompt" title="Requires authentication">
     <div id="auth_note"></div>

diff --git a/EditTablePlugin/lib/Foswiki/Plugins/EditTablePlugin.pm b/EditTablePlugin/lib/Foswiki/Plugins/EditTablePlugin.pm
@@ -83,7 +83,7 @@ We cannot do table parsing in commonTagsHandler because by then the TML has been
 =cut
 
 sub beforeCommonTagsHandler {
-    return unless $_[0] =~ /%EDIT(?:TABLE|CELL){.*}%/;
+    return unless $_[0] =~ /%EDIT(?:TABLE|CELL)\{.*\}%/;
     Foswiki::Func::writeDebug(
         "EditTablePlugin::beforeCommonTagsHandler( $web.$topic )")
       if $debug;
@@ -108,7 +108,7 @@ Calls EditTablePlugin::Core::parseTables for INCLUDEd topics.
 =cut
 
 sub commonTagsHandler {
-    return unless $_[0] =~ /%EDIT(?:TABLE|CELL|TABLESTUB){.*}%/;
+    return unless $_[0] =~ /%EDIT(?:TABLE|CELL|TABLESTUB)\{.*\}%/;
 
     Foswiki::Func::writeDebug(
         "EditTablePlugin::commonTagsHandler( $web.$topic )")

diff --git a/FastCGIEngineContrib/bin-htaccess-fastcgi.txt b/FastCGIEngineContrib/bin-htaccess-fastcgi.txt
@@ -0,0 +1,72 @@
+# Sample bin/.htaccess file.   If you require .htaccess files for your apache
+# configuration, tailor this file using the below instructions.  See
+# bin-htaccess-advanced for a more complete configuration example.
+#
+# This file is intended for a simple Foswiki installation using Foswiki
+# Template login authentication.  It will frequently "just work"
+# without needing further tailoring.
+
+##################################
+#  Bot / Spider controls
+##################################
+
+# We set an environment variable called anonymous_spider
+# Setting a BrowserMatchNoCase to ^$ is important. It prevents Foswiki from
+# including its own topics as URLs and also prevents other Foswikis from
+# doing the same. This is important to prevent the most obvious
+# Denial of Service attacks.
+# You can expand this by adding more BrowserMatchNoCase statements to
+# block evil browser agents trying the impossible task of mirroring a Foswiki
+# Example:
+# BrowserMatchNoCase ^SiteSucker anonymous_spider
+BrowserMatchNoCase ^$ anonymous_spider
+
+######################################################################
+# Now set default access rights.
+# - This block will work with Apach 2.2, or 2.4 with mod_access_Compat enabled
+# If this causes errors, comment this out, and enable the 2.4 specific block.
+######################################################################
+Order Allow,Deny
+Allow from all
+Deny from env=anonymous_spider
+
+######################################################################
+# Uncomment this block for Apache 2.4
+######################################################################
+#<RequireAll>
+# Require not env anonymous_spider
+# Require all granted
+#</RequireAll>
+
+######################################################################
+# This block used if mod_rewrite is available.  If not, comment it out
+######################################################################
+RewriteEngine On 
+RewriteCond %{REQUEST_URI} !/foswiki.fcgi 
+RewriteRule ^(.*) /bin/foswiki.fcgi/$1 
+
+######################################################################
+# This block used if mod_action is available.
+#Uncomment if mod_rewrite cannot be used.
+######################################################################
+#Action foswiki-fcgid /bin/foswiki.fcgi 
+#SetHandler foswiki-fcgid 
+#<Files foswiki.fcgi> 
+#   SetHandler fcgid-script 
+#</Files> 
+
+
+# Set options for excuting CGI and allow symlinks for e.g. viewauth
+# This also unsets any options allowing directory indexing etc.
+Options ExecCGI FollowSymLinks
+
+# Make sure that any local lib definitions cannot be retrieved
+# For apache 2.4. uncomment the "Require" line and comment the Order and Deny lines
+<Files  "LocalLib*">
+#  Require all denied
+  Order allow,deny
+  Deny from all
+</Files>
+
+# bin/.htaccess file 
+