diff --git a/.htaccess b/.htaccess index 3e6eb31938e46..90b4040f95964 100644 --- a/.htaccess +++ b/.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/.htaccess.sample b/.htaccess.sample index e70eb9d022412..79d41954fc607 100644 --- a/.htaccess.sample +++ b/.htaccess.sample @@ -35,7 +35,7 @@ ############################################ ## 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 50ad8bdbb3e33..158c588d11358 100644 --- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php +++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php @@ -136,8 +136,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/nginx.conf.sample b/nginx.conf.sample index d2f10502e03f8..58c059657c070 100644 --- a/nginx.conf.sample +++ b/nginx.conf.sample @@ -41,7 +41,7 @@ location ~* ^/setup($|/) { fastcgi_pass fastcgi_backend; fastcgi_param PHP_FLAG "session.auto_start=off \n suhosin.session.cryptua=off"; - fastcgi_param PHP_VALUE "memory_limit=768M \n max_execution_time=600"; + fastcgi_param PHP_VALUE "memory_limit=756M \n max_execution_time=600"; fastcgi_read_timeout 600s; fastcgi_connect_timeout 600s; @@ -168,7 +168,7 @@ location ~ (index|get|static|report|404|503)\.php$ { fastcgi_buffers 1024 4k; fastcgi_param PHP_FLAG "session.auto_start=off \n suhosin.session.cryptua=off"; - fastcgi_param PHP_VALUE "memory_limit=768M \n max_execution_time=18000"; + fastcgi_param PHP_VALUE "memory_limit=756M \n max_execution_time=18000"; fastcgi_read_timeout 600s; fastcgi_connect_timeout 600s; diff --git a/pub/.htaccess b/pub/.htaccess index bdae9be342d8d..047ba279f8651 100644 --- a/pub/.htaccess +++ b/pub/.htaccess @@ -37,7 +37,7 @@ ############################################ ## Adjust memory limit - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 ############################################ @@ -60,7 +60,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