From dec0dfa3a81e23a5a123be56ae8b36e0f1ed9137 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 22 Feb 2012 09:47:32 -0500
Subject: [PATCH] Merged revisions 2916-2941 from stable branch.
---
server/conf/nginx_apps.vhost.master | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/server/conf/nginx_apps.vhost.master b/server/conf/nginx_apps.vhost.master
index 9de75dd..560f6b5 100644
--- a/server/conf/nginx_apps.vhost.master
+++ b/server/conf/nginx_apps.vhost.master
@@ -5,6 +5,8 @@
root {apps_vhost_dir};
+ client_max_body_size 20M;
+
location / {
index index.php index.html;
}
@@ -41,12 +43,12 @@
# To access phpMyAdmin, the default user (like www-data on Debian/Ubuntu) must be used
fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
- fastcgi_param SCRIPT_FILENAME $request_filename;
- fastcgi_param PATH_INFO $fastcgi_script_name;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_buffer_size 128k;
fastcgi_buffers 256 4k;
fastcgi_busy_buffers_size 256k;
fastcgi_temp_file_write_size 256k;
+ fastcgi_read_timeout 240;
}
location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
root /usr/share/;
@@ -66,8 +68,7 @@
# To access SquirrelMail, the default user (like www-data on Debian/Ubuntu) must be used
fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
- fastcgi_param SCRIPT_FILENAME $request_filename;
- fastcgi_param PATH_INFO $fastcgi_script_name;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_buffer_size 128k;
fastcgi_buffers 256 4k;
fastcgi_busy_buffers_size 256k;
--
Gitblit v1.9.1