Merge branch 'Release02x01'

foswiki · Mar 25, 2017 · d42884a · d42884a
2 parents 5b45b80 + 6d438dc
commit d42884a
Show file tree

Hide file tree

Showing 32 changed files with 13 additions and 3,505 deletions.
diff --git a/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt b/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1490124221" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1490401384" format="1.1" version="1"}%
 ---+!! <nop>FastCGI Engine Contrib
 %$SHORTDESCRIPTION%
 
@@ -144,6 +144,8 @@ server {
     error_log   /var/log/nginx/foswiki-error.log;
     #error_log   /var/log/nginx/foswiki-error.log debug;
 
+    client_max_body_size 10M;   # Set to maximum attachment size, See also ATTACHFILESIZELIMIT
+
     location = / {
         root $foswiki_root;
     rewrite .* /Main/WebHome;
@@ -153,7 +155,7 @@ server {
         allow all;
     }
 
-    location /bin/ {
+    location ~ ^/bin/ {
            gzip off;
            #fastcgi_pass             unix:/var/run/nginx/foswiki.sock;
            fastcgi_pass             127.0.0.1:9000;

diff --git a/FastCGIEngineContrib/tools/foswiki.defaults b/FastCGIEngineContrib/tools/foswiki.defaults
@@ -1,6 +1,6 @@
 FOSWIKI_ROOT=/home/www-data/foswiki/core
 FOSWIKI_FCGI=foswiki.fcgi
-FOSWIKI_BIND=127.0.0.1:9001
+FOSWIKI_BIND=127.0.0.1:9000
 FOSWIKI_CHILDREN=3
 FOSWIKI_MAX_REQUESTS=-1
 FOSWIKI_MAX_SIZE=200000

diff --git a/core/tools/builddistros.pl b/core/tools/builddistros.pl
diff --git a/core/tools/checkout_extensions b/core/tools/checkout_extensions
diff --git a/core/tools/develop/cron.pl b/core/tools/develop/cron.pl
diff --git a/core/tools/develop/cron.sh b/core/tools/develop/cron.sh
diff --git a/core/tools/develop/foswiki-git-upgrade.pl b/core/tools/develop/foswiki-git-upgrade.pl