summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorHimanshu Lakhara <himanshulakhara1947@gmail.com>2019-02-06 19:27:37 +0530
committerTim Graham <timograham@gmail.com>2019-02-08 14:53:15 -0500
commit22aab8662f0368b63f91f2526bdd0532524bc0fe (patch)
tree4408314b380969ab203b26fe0fe6c5b9ad1ab1f9 /docs
parente7fd69d051eaa67cb17f172a39b57253e9cb831a (diff)
Fixed #30004 -- Changed default FILE_UPLOAD_PERMISSION to 0o644.
Diffstat (limited to 'docs')
-rw-r--r--docs/howto/deployment/checklist.txt10
-rw-r--r--docs/ref/settings.txt6
-rw-r--r--docs/releases/3.0.txt11
3 files changed, 16 insertions, 11 deletions
diff --git a/docs/howto/deployment/checklist.txt b/docs/howto/deployment/checklist.txt
index c31bcac62a..b307076b62 100644
--- a/docs/howto/deployment/checklist.txt
+++ b/docs/howto/deployment/checklist.txt
@@ -154,16 +154,6 @@ server never attempts to interpret them. For instance, if a user uploads a
Now is a good time to check your backup strategy for these files.
-:setting:`FILE_UPLOAD_PERMISSIONS`
-----------------------------------
-
-With the default file upload settings, files smaller than
-:setting:`FILE_UPLOAD_MAX_MEMORY_SIZE` may be stored with a different mode
-than larger files as described in :setting:`FILE_UPLOAD_PERMISSIONS`.
-
-Setting :setting:`FILE_UPLOAD_PERMISSIONS` ensures all files are uploaded with
-the same permissions.
-
HTTPS
=====
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 46e99af993..0bac3fc9d0 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1484,7 +1484,7 @@ This value mirrors the functionality and caveats of the
``FILE_UPLOAD_PERMISSIONS``
---------------------------
-Default: ``None``
+Default: ``0o644``
The numeric mode (i.e. ``0o644``) to set newly uploaded files to. For
more information about what these modes mean, see the documentation for
@@ -1511,6 +1511,10 @@ when using the :djadmin:`collectstatic` management command. See
way that modes must be specified. If you try to use ``644``, you'll
get totally incorrect behavior.
+.. versionchanged:: 3.0
+
+ In older versions, the default value is ``None``.
+
.. setting:: FILE_UPLOAD_TEMP_DIR
``FILE_UPLOAD_TEMP_DIR``
diff --git a/docs/releases/3.0.txt b/docs/releases/3.0.txt
index 5d9bff086e..7d88d4d9ef 100644
--- a/docs/releases/3.0.txt
+++ b/docs/releases/3.0.txt
@@ -284,6 +284,17 @@ Django 3.0, we're removing these APIs at this time.
* ``django.utils.safestring.SafeBytes`` - Unused since Django 2.0.
+New default value for the ``FILE_UPLOAD_PERMISSIONS`` setting
+-------------------------------------------------------------
+
+In older versions, the :setting:`FILE_UPLOAD_PERMISSIONS` setting defaults to
+``None``. With the default :setting:`FILE_UPLOAD_HANDLERS`, this results in
+uploaded files having different permissions depending on their size and which
+upload handler is used.
+
+``FILE_UPLOAD_PERMISSION`` now defaults to ``0o644`` to avoid this
+inconsistency.
+
Miscellaneous
-------------