Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer

2015-04-11 f49af08410c6b530df47e4318d18db707d8d2687

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

 install/tpl/php_fpm_pool.conf.master

@@ -16,6 +16,6 @@

chdir = /

; php_admin_value[open_basedir] = /usr/local/ispconfig/interface:/usr/local/ispconfig/security:/usr/share
; 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

 server/lib/classes/aps_installer.inc.php

@@ -633,6 +633,7 @@
            curl_setopt($ch, CURLOPT_TIMEOUT, 0);
            curl_setopt($ch, CURLOPT_FAILONERROR, 1);
            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
            if(curl_exec($ch) === false) $app->log(curl_error($ch), 1);
            fclose($fh);
            curl_close($ch);