Merge pull request #161 from magento-fearless-kiwis/FearlessKiwis-MAG…

…ETWO-51428-php_memory_limits [Fearless Kiwis] MAGETWO-51428: PHP memory limits
magento · Jul 19, 2016 · ffd9cc6 · ffd9cc6
2 parents 27c7763 + 8ae3f47
commit ffd9cc6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 92 deletions.
diff --git a/.htaccess b/.htaccess
@@ -32,34 +32,6 @@
 
     DirectoryIndex index.php
 
-<IfModule mod_php5.c>
-
-############################################
-## adjust memory limit
-
-    php_value memory_limit 768M
-    php_value max_execution_time 18000
-
-############################################
-## disable automatic session start
-## before autoload was initialized
-
-    php_flag session.auto_start off
-
-############################################
-## enable resulting html compression
-
-    #php_flag zlib.output_compression on
-
-###########################################
-## disable user agent verification to not break multiple image upload
-
-    php_flag suhosin.session.cryptua off
-
-</IfModule>
-
-<IfModule mod_php7.c>
-
 ############################################
 ## adjust memory limit
 
@@ -82,8 +54,6 @@
 
     php_flag suhosin.session.cryptua off
 
-</IfModule>
-
 <IfModule mod_security.c>
 ###########################################
 ## disable POST processing to not break multiple image upload

diff --git a/.htaccess.sample b/.htaccess.sample
@@ -32,34 +32,6 @@
 
     DirectoryIndex index.php
 
-<IfModule mod_php5.c>
-
-############################################
-## adjust memory limit
-
-    php_value memory_limit 768M
-    php_value max_execution_time 18000
-
-############################################
-## disable automatic session start
-## before autoload was initialized
-
-    php_flag session.auto_start off
-
-############################################
-## enable resulting html compression
-
-    #php_flag zlib.output_compression on
-
-###########################################
-## disable user agent verification to not break multiple image upload
-
-    php_flag suhosin.session.cryptua off
-
-</IfModule>
-
-<IfModule mod_php7.c>
-
 ############################################
 ## adjust memory limit
 
@@ -82,8 +54,6 @@
 
     php_flag suhosin.session.cryptua off
 
-</IfModule>
-
 <IfModule mod_security.c>
 ###########################################
 ## disable POST processing to not break multiple image upload

diff --git a/nginx.conf.sample b/nginx.conf.sample
@@ -167,7 +167,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=600";
+    fastcgi_param  PHP_VALUE "memory_limit=768M \n max_execution_time=18000";
     fastcgi_read_timeout 600s;
     fastcgi_connect_timeout 600s;
 

diff --git a/pub/.htaccess b/pub/.htaccess
@@ -32,12 +32,10 @@
 
     DirectoryIndex index.php
 
-<IfModule mod_php5.c>
-
 ############################################
 ## Adjust memory limit
 
-    php_value memory_limit 256M
+    php_value memory_limit 768M
     php_value max_execution_time 18000
 
 ############################################
@@ -56,34 +54,6 @@
 
     php_flag suhosin.session.cryptua off
 
-</IfModule>
-
-<IfModule mod_php7.c>
-
-############################################
-## Adjust memory limit
-
-    php_value memory_limit 256M
-    php_value max_execution_time 18000
-
-############################################
-## Disable automatic session start
-## before autoload was initialized
-
-    php_flag session.auto_start off
-
-############################################
-## Enable resulting html compression
-
-    #php_flag zlib.output_compression on
-
-###########################################
-# Disable user agent verification to not break multiple image upload
-
-    php_flag suhosin.session.cryptua off
-
-</IfModule>
-
 <IfModule mod_security.c>
 ###########################################
 # Disable POST processing to not break multiple image upload