From bd9062bb8b409de5e7759bf588c1dbd0068f6067 Mon Sep 17 00:00:00 2001
From: Gervase Markham <gerv@gerv.net>
Date: Fri, 24 Oct 2014 09:17:24 +0100
Subject: Revert "Bug 1073264 - allow attachment download to be offloaded to
 the webserver using X-SendFile or equivalent. r=gerv, a=glob." Morning brain
 thought this bug was approved for 5.0.

This reverts commit 55e8faeed19ff618483cb5803847bdba6c80c752.
---
 .../en/default/admin/params/attachment.html.tmpl   | 28 +---------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

(limited to 'template')

diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl
index c850802ab..5efcc1106 100644
--- a/template/en/default/admin/params/attachment.html.tmpl
+++ b/template/en/default/admin/params/attachment.html.tmpl
@@ -58,31 +58,5 @@
   maxlocalattachment => "The maximum size (in megabytes) of attachments to be stored " _
                         "locally on the web server. If set to a value lower than the " _
                         "<a href=\"#maxattachmentsize\"><var>maxattachmentsize</var> parameter</a>, " _
-                        "attachments will never be kept on the local filesystem. " _
-                        "If you want to store all attachments on disk rather than in the " _
-                        "database, then set <a href=\"#maxattachmentsize\">" _
-                        "<var>maxattachmentsize</var> parameter</a> to 0. ",
-
-
-  xsendfile_header =>
-    "By default, attachments are served by the CGI script. " _
-    "If you enable filesystem file storage for large files using the " _
-    "<a href=\"#maxlocalattachment\"><var>maxlocalattachment</var> parameter</a> " _
-    "then you can have those files served directly by the webserver, which " _
-    "avoids copying them entirely into memory, and this may result in a " _
-    "performance improvement. To do this, configure your webserver appropriately " _
-    "and then set the correct header, as follows:" _
-    "<ul>" _
-    "<li>Apache: <code>X-Sendfile</code> header; see " _
-    "<code><a href=\"https://tn123.org/mod_xsendfile/\">mod_xsendfile</a></code> module</li>" _
-    "<li>nginx: <code>X-Accel-Redirect</code> header; see "_
-    "<a href=\"http://wiki.nginx.org/X-accel\">webserver documentation</a> for additional configuration</li>" _
-    "<li>lighttpd: <code>X-LIGHTTPD-send-file</code> header; see " _
-    "<a href=\"http://redmine.lighttpd.net/projects/1/wiki/X-LIGHTTPD-send-file\">webserver documentation</a> for additional configuration</li>" _
-    "</ul><br>" _
-    "Please note that attachments stored in the database cannot be offloaded " _
-    "to apache/nginx/lighttpd and are always handled by the CGI script."
-
-  }
-
+                        "attachments will never be kept on the local filesystem." }
 %]
-- 
cgit v1.2.1