Skip to content

Commit f49af08

Browse files
author
Marius Cramer
committed
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
2 parents d69383d + 6bdb100 commit f49af08

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

install/tpl/php_fpm_pool.conf.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ pm.max_spare_servers = 5
1616

1717
chdir = /
1818

19-
; php_admin_value[open_basedir] = /usr/local/ispconfig/interface:/usr/local/ispconfig/security:/usr/share
19+
; php_admin_value[open_basedir] = /usr/local/ispconfig/interface:/usr/local/ispconfig/security:/usr/share:/var/lib/roundcube:/etc/roundcube:/usr/share/roundcube
2020
php_admin_value[session.save_path] = /usr/local/ispconfig/interface/temp
2121
php_admin_flag[magic_quotes_gpc] = off

server/lib/classes/aps_installer.inc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ public function installHandler($instanceid, $type)
633633
curl_setopt($ch, CURLOPT_TIMEOUT, 0);
634634
curl_setopt($ch, CURLOPT_FAILONERROR, 1);
635635
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
636+
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
636637
if(curl_exec($ch) === false) $app->log(curl_error($ch), 1);
637638
fclose($fh);
638639
curl_close($ch);

0 commit comments

Comments
 (0)