Merge remote-tracking branch 'tango-ce/MAGETWO-55757' into MAGETWO-57876

magento · Aug 31, 2016 · 4315b5a · 4315b5a
2 parents d323ecb + be08f1a
commit 4315b5a
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 0 deletions.
diff --git a/.htaccess b/.htaccess
@@ -32,6 +32,7 @@
 
     DirectoryIndex index.php
 
+<IfModule mod_php5.c>
 ############################################
 ## adjust memory limit
 
@@ -53,7 +54,30 @@
 ## disable user agent verification to not break multiple image upload
 
     php_flag suhosin.session.cryptua off
+</IfModule>
+<IfModule mod_php7.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_security.c>
 ###########################################
 ## disable POST processing to not break multiple image upload

diff --git a/.user.ini b/.user.ini
@@ -0,0 +1,4 @@
+memory_limit = 768M
+max_execution_time = 18000
+session.auto_start = off
+suhosin.session.cryptua = off
diff --git a/pub/.htaccess b/pub/.htaccess
@@ -32,6 +32,7 @@
 
     DirectoryIndex index.php
 
+<IfModule mod_php5.c>
 ############################################
 ## Adjust memory limit
 
@@ -53,6 +54,31 @@
 # Disable user agent verification to not break multiple image upload
 
     php_flag suhosin.session.cryptua off
+</IfModule>
+<IfModule mod_php7.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_security.c>
 ###########################################

diff --git a/pub/.user.ini b/pub/.user.ini
@@ -0,0 +1,4 @@
+memory_limit = 768M
+max_execution_time = 18000
+session.auto_start = off
+suhosin.session.cryptua = off