From b2a7e7b0416a59a5625dd894239f8adea422bb4e Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 28 Jul 2018 11:39:59 +0200 Subject: [PATCH] Ensure memory_limit, post_max_size and upload_max_filesize have a correct ration --- Dockerfiles/base/data/php.d/php-5.3.ini | 4 +++- Dockerfiles/base/data/php.d/php-5.4.ini | 4 +++- Dockerfiles/base/data/php.d/php-5.5.ini | 4 +++- Dockerfiles/base/data/php.d/php-5.6.ini | 4 +++- Dockerfiles/base/data/php.d/php-7.0.ini | 4 +++- Dockerfiles/base/data/php.d/php-7.1.ini | 4 +++- Dockerfiles/base/data/php.d/php-7.2.ini | 4 +++- Dockerfiles/base/data/php.d/php-7.3.ini | 4 +++- build/ansible/CONFIGURATION/php-base.ini.j2 | 4 +++- 9 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Dockerfiles/base/data/php.d/php-5.3.ini b/Dockerfiles/base/data/php.d/php-5.3.ini index b3de1ec..0d1ed60 100644 --- a/Dockerfiles/base/data/php.d/php-5.3.ini +++ b/Dockerfiles/base/data/php.d/php-5.3.ini @@ -11,6 +11,7 @@ [PHP] ; Memory +; Note: "memory_limit" should be larger than "post_max_size" memory_limit = 512M @@ -20,7 +21,8 @@ max_input_time = 180 ; Uploads -post_max_size = 256M +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M upload_max_filesize = 256M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php.d/php-5.4.ini b/Dockerfiles/base/data/php.d/php-5.4.ini index b3de1ec..0d1ed60 100644 --- a/Dockerfiles/base/data/php.d/php-5.4.ini +++ b/Dockerfiles/base/data/php.d/php-5.4.ini @@ -11,6 +11,7 @@ [PHP] ; Memory +; Note: "memory_limit" should be larger than "post_max_size" memory_limit = 512M @@ -20,7 +21,8 @@ max_input_time = 180 ; Uploads -post_max_size = 256M +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M upload_max_filesize = 256M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php.d/php-5.5.ini b/Dockerfiles/base/data/php.d/php-5.5.ini index b3de1ec..0d1ed60 100644 --- a/Dockerfiles/base/data/php.d/php-5.5.ini +++ b/Dockerfiles/base/data/php.d/php-5.5.ini @@ -11,6 +11,7 @@ [PHP] ; Memory +; Note: "memory_limit" should be larger than "post_max_size" memory_limit = 512M @@ -20,7 +21,8 @@ max_input_time = 180 ; Uploads -post_max_size = 256M +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M upload_max_filesize = 256M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php.d/php-5.6.ini b/Dockerfiles/base/data/php.d/php-5.6.ini index b3de1ec..0d1ed60 100644 --- a/Dockerfiles/base/data/php.d/php-5.6.ini +++ b/Dockerfiles/base/data/php.d/php-5.6.ini @@ -11,6 +11,7 @@ [PHP] ; Memory +; Note: "memory_limit" should be larger than "post_max_size" memory_limit = 512M @@ -20,7 +21,8 @@ max_input_time = 180 ; Uploads -post_max_size = 256M +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M upload_max_filesize = 256M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php.d/php-7.0.ini b/Dockerfiles/base/data/php.d/php-7.0.ini index b3de1ec..0d1ed60 100644 --- a/Dockerfiles/base/data/php.d/php-7.0.ini +++ b/Dockerfiles/base/data/php.d/php-7.0.ini @@ -11,6 +11,7 @@ [PHP] ; Memory +; Note: "memory_limit" should be larger than "post_max_size" memory_limit = 512M @@ -20,7 +21,8 @@ max_input_time = 180 ; Uploads -post_max_size = 256M +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M upload_max_filesize = 256M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php.d/php-7.1.ini b/Dockerfiles/base/data/php.d/php-7.1.ini index b3de1ec..0d1ed60 100644 --- a/Dockerfiles/base/data/php.d/php-7.1.ini +++ b/Dockerfiles/base/data/php.d/php-7.1.ini @@ -11,6 +11,7 @@ [PHP] ; Memory +; Note: "memory_limit" should be larger than "post_max_size" memory_limit = 512M @@ -20,7 +21,8 @@ max_input_time = 180 ; Uploads -post_max_size = 256M +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M upload_max_filesize = 256M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php.d/php-7.2.ini b/Dockerfiles/base/data/php.d/php-7.2.ini index ae3a78c..6eba34e 100644 --- a/Dockerfiles/base/data/php.d/php-7.2.ini +++ b/Dockerfiles/base/data/php.d/php-7.2.ini @@ -11,6 +11,7 @@ [PHP] ; Memory +; Note: "memory_limit" should be larger than "post_max_size" memory_limit = 512M @@ -20,7 +21,8 @@ max_input_time = 180 ; Uploads -post_max_size = 256M +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M upload_max_filesize = 256M max_file_uploads = 20 diff --git a/Dockerfiles/base/data/php.d/php-7.3.ini b/Dockerfiles/base/data/php.d/php-7.3.ini index ae3a78c..6eba34e 100644 --- a/Dockerfiles/base/data/php.d/php-7.3.ini +++ b/Dockerfiles/base/data/php.d/php-7.3.ini @@ -11,6 +11,7 @@ [PHP] ; Memory +; Note: "memory_limit" should be larger than "post_max_size" memory_limit = 512M @@ -20,7 +21,8 @@ max_input_time = 180 ; Uploads -post_max_size = 256M +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M upload_max_filesize = 256M max_file_uploads = 20 diff --git a/build/ansible/CONFIGURATION/php-base.ini.j2 b/build/ansible/CONFIGURATION/php-base.ini.j2 index 655c2bd..49d8e5f 100644 --- a/build/ansible/CONFIGURATION/php-base.ini.j2 +++ b/build/ansible/CONFIGURATION/php-base.ini.j2 @@ -11,6 +11,7 @@ [PHP] ; Memory +; Note: "memory_limit" should be larger than "post_max_size" memory_limit = 512M @@ -20,7 +21,8 @@ max_input_time = 180 ; Uploads -post_max_size = 256M +; Note: "post_max_size" should be greater than "upload_max_filesize" +post_max_size = 384M upload_max_filesize = 256M max_file_uploads = 20