From 5dcc61839134091f6c02e113b5cc0cc20e69ce52 Mon Sep 17 00:00:00 2001 From: Robert He Date: Wed, 29 Jun 2016 16:19:09 -0500 Subject: [PATCH] MAGETWO-51428: Duplication of PHP memory settings in sample web-server config files - remove duplication of PHP memory limits --- .htaccess | 30 ------------------------------ .htaccess.sample | 30 ------------------------------ nginx.conf.sample | 2 +- pub/.htaccess | 32 +------------------------------- 4 files changed, 2 insertions(+), 92 deletions(-) diff --git a/.htaccess b/.htaccess index 61a6e70d03e7f..f3dbe217081ac 100644 --- a/.htaccess +++ b/.htaccess @@ -32,34 +32,6 @@ DirectoryIndex index.php - - -############################################ -## 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 - - - - - ############################################ ## adjust memory limit @@ -82,8 +54,6 @@ php_flag suhosin.session.cryptua off - - ########################################### ## disable POST processing to not break multiple image upload diff --git a/.htaccess.sample b/.htaccess.sample index 61a6e70d03e7f..f3dbe217081ac 100644 --- a/.htaccess.sample +++ b/.htaccess.sample @@ -32,34 +32,6 @@ DirectoryIndex index.php - - -############################################ -## 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 - - - - - ############################################ ## adjust memory limit @@ -82,8 +54,6 @@ php_flag suhosin.session.cryptua off - - ########################################### ## disable POST processing to not break multiple image upload diff --git a/nginx.conf.sample b/nginx.conf.sample index 95f03f4dd2145..de37b23d759fe 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 926c012eef6a5..a8fc2ccf222db 100644 --- a/pub/.htaccess +++ b/pub/.htaccess @@ -32,12 +32,10 @@ DirectoryIndex index.php - - ############################################ ## 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 - - - - -############################################ -## 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 - - - ########################################### # Disable POST processing to not break multiple image upload