From a9b32524711b32a1a42bbb26fd6a3006a7d2d07a Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 29 Jun 2015 13:03:37 -0400
Subject: [PATCH] - Ported patches

---
 install/tpl/php_fpm_pool.conf.master |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/install/tpl/php_fpm_pool.conf.master b/install/tpl/php_fpm_pool.conf.master
index 16e1241..51b1840 100644
--- a/install/tpl/php_fpm_pool.conf.master
+++ b/install/tpl/php_fpm_pool.conf.master
@@ -18,4 +18,7 @@
 
 ; php_admin_value[open_basedir] = /usr/local/ispconfig/interface:/usr/local/ispconfig/security:/usr/share:/var/lib/roundcube:/etc/roundcube:/usr/share/roundcube
 php_admin_value[session.save_path] = /usr/local/ispconfig/interface/temp
-php_admin_flag[magic_quotes_gpc] = off
\ No newline at end of file
+php_admin_flag[magic_quotes_gpc] = off
+
+php_admin_value[memory_limit] = 4096M
+php_admin_value[max_execution_time] = 1200

--
Gitblit v1.9.1