[BACKPORT 2.1] [TASK] Incorrect minimum memory_limit references have been updated from 768M to 756M

lewisvoncken · lewisvoncken · commit 000eaf143216 · 2017-10-26T08:55:39.000Z
diff --git a/.htaccess b/.htaccess
@@ -1,13 +1,13 @@
 # All explanations you could find in .htaccess.sample file
 DirectoryIndex index.php
 <IfModule mod_php5.c>
-    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
 </IfModule>
 <IfModule mod_php7.c>
-    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
@@ -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
@@ -1,4 +1,4 @@
-memory_limit = 768M
+memory_limit = 756M
 max_execution_time = 18000
 session.auto_start = off
 suhosin.session.cryptua = off
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-memory_limit = 768M
+memory_limit = 756M
 max_execution_time = 18000
 session.auto_start = off
 suhosin.session.cryptua = off

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ private function updateMemoryLimit()`
`137`	`137`	`if (function_exists('ini_set')) {`
`138`	`138`	`@ini_set('display_errors', 1);`
`139`	`139`	`$memoryLimit = trim(ini_get('memory_limit'));`
`140`		`- if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 768 * 1024 * 1024) {`
`141`		`- @ini_set('memory_limit', '768M');`
	`140`	`+ if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 756 * 1024 * 1024) {`
	`141`	`+ @ini_set('memory_limit', '756M');`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`}`