diff --git a/.htaccess b/.htaccess
index 61a6e70d03e7fa02725f65564b63b4b91e93a249..f3dbe217081acf1a326db6567cc15e4c3fc3bc7f 100644
--- 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
index 61a6e70d03e7fa02725f65564b63b4b91e93a249..f3dbe217081acf1a326db6567cc15e4c3fc3bc7f 100644
--- 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
index 95f03f4dd2145f6f5521f1cb5eb770645e0c9f40..de37b23d759fe36735eac10a263169179eb62ae9 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -161,7 +161,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
index 926c012eef6a577d36dbf953e6797cb291bed5af..a8fc2ccf222dbb6a7ba562a0e18ddff9cfdca21c 100644
--- 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