From ebd0e986ed11f2a34fb58cdd33efbfab192083ad Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 22 Apr 2016 05:26:17 -0400
Subject: [PATCH] Added PHP 7 check in installer and updater.
---
server/lib/classes/aps_installer.inc.php | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/server/lib/classes/aps_installer.inc.php b/server/lib/classes/aps_installer.inc.php
index 5503464..d6ff4f7 100644
--- a/server/lib/classes/aps_installer.inc.php
+++ b/server/lib/classes/aps_installer.inc.php
@@ -373,14 +373,16 @@
/* Test if the new mysql connection is laready working to ensure that db servers in multiserver
setups get enough time to create the database */
- for($n = 1; $n < 15; $n++) {
- $mysqli = new mysqli($newdb_host, $newdb_login, $newdb_pw, $newdb_name);
- if ($mysqli->connect_error) {
- unset($mysqli);
- sleep(5);
- } else {
- unset($mysqli);
- break;
+ if($this->handle_type == 'install') {
+ for($n = 1; $n < 15; $n++) {
+ $link = mysql_connect($newdb_host, $newdb_login, $newdb_pw);
+ if (!$link) {
+ unset($link);
+ sleep(5);
+ } else {
+ unset($link);
+ break;
+ }
}
}
@@ -552,6 +554,7 @@
curl_setopt($conn[$i], CURLOPT_TIMEOUT, 0);
curl_setopt($conn[$i], CURLOPT_FAILONERROR, 1);
curl_setopt($conn[$i], CURLOPT_FOLLOWLOCATION, 1);
+ curl_setopt($conn[$i], CURLOPT_SSL_VERIFYPEER, 0);
curl_multi_add_handle($mh, $conn[$i]);
}
@@ -694,6 +697,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);
--
Gitblit v1.9.1