From 000eaf143216314ad9c51e51b76f7151f9819b21 Mon Sep 17 00:00:00 2001 From: Lewis Voncken Date: Thu, 26 Oct 2017 08:55:39 +0000 Subject: [PATCH] [BACKPORT 2.1] [TASK] Incorrect minimum memory_limit references have been updated from 768M to 756M --- .htaccess | 4 ++-- .htaccess.sample | 4 ++-- .user.ini | 2 +- .../SampleData/Console/Command/SampleDataDeployCommand.php | 4 ++-- pub/.htaccess | 4 ++-- pub/.user.ini | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.htaccess b/.htaccess index 89e39655e9289..c67d0b95272b4 100644 --- a/.htaccess +++ b/.htaccess @@ -1,13 +1,13 @@ # All explanations you could find in .htaccess.sample file DirectoryIndex index.php - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 php_flag session.auto_start off php_flag suhosin.session.cryptua off - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 php_flag session.auto_start off php_flag suhosin.session.cryptua off diff --git a/.htaccess.sample b/.htaccess.sample index 85eac7913c73b..13e1e7d48d3e3 100644 --- a/.htaccess.sample +++ b/.htaccess.sample @@ -36,7 +36,7 @@ DirectoryIndex index.php ############################################ ## adjust memory limit - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 ############################################ @@ -59,7 +59,7 @@ DirectoryIndex index.php ############################################ ## adjust memory limit - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 ############################################ diff --git a/.user.ini b/.user.ini index 8c0b765e0551c..bfc3a86d88e20 100644 --- a/.user.ini +++ b/.user.ini @@ -1,4 +1,4 @@ -memory_limit = 768M +memory_limit = 756M max_execution_time = 18000 session.auto_start = off suhosin.session.cryptua = off \ No newline at end of file diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php index 2702eef0c03f0..0dd048f903668 100644 --- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php +++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php @@ -137,8 +137,8 @@ private function updateMemoryLimit() if (function_exists('ini_set')) { @ini_set('display_errors', 1); $memoryLimit = trim(ini_get('memory_limit')); - if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 768 * 1024 * 1024) { - @ini_set('memory_limit', '768M'); + if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 756 * 1024 * 1024) { + @ini_set('memory_limit', '756M'); } } } diff --git a/pub/.htaccess b/pub/.htaccess index ecdaf1758a92a..7bcc78f125ae4 100644 --- a/pub/.htaccess +++ b/pub/.htaccess @@ -36,7 +36,7 @@ ############################################ ## Adjust memory limit - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 ############################################ @@ -59,7 +59,7 @@ ############################################ ## Adjust memory limit - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 ############################################ diff --git a/pub/.user.ini b/pub/.user.ini index 8c0b765e0551c..bfc3a86d88e20 100644 --- a/pub/.user.ini +++ b/pub/.user.ini @@ -1,4 +1,4 @@ -memory_limit = 768M +memory_limit = 756M max_execution_time = 18000 session.auto_start = off suhosin.session.cryptua = off \ No newline at end of file