diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index e62f5961d..d880f890b 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -388,26 +388,26 @@ class installController extends install
FileHandler::writeFile(_XE_PATH_.$checkFilePath, trim($checkString));
+ $scheme = $_SERVER['REQUEST_SCHEME'];
$hostname = $_SERVER['SERVER_NAME'];
$port = $_SERVER['SERVER_PORT'];
+ $str_port = '';
+ if($port)
+ {
+ $str_port = ':' . $port;
+ }
+
$query = "/JUST/CHECK/REWRITE/" . $checkFilePath;
$currentPath = str_replace($_SERVER['DOCUMENT_ROOT'], "", _XE_PATH_);
if($currentPath != "")
+ {
$query = $currentPath . $query;
-
- $fp = @fsockopen($hostname, $port, $errno, $errstr, 5);
- if(!$fp) return false;
-
- fputs($fp, "GET {$query} HTTP/1.0\r\n");
- fputs($fp, "Host: {$hostname}\r\n\r\n");
-
- $buff = '';
- while(!feof($fp)) {
- $str = fgets($fp, 1024);
- if(trim($str)=='') $start = true;
- if($start) $buff .= $str;
}
- fclose($fp);
+
+ $requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query);
+ $requestConfig = array();
+ $requestConfig['ssl_verify_peer'] = false;
+ $buff = FileHandler::getRemoteResource($requestUrl, null, 10, 'POST', 'application/x-www-form-urlencoded', array(), array(), array(), $requestConfig);
FileHandler::removeFile(_XE_PATH_.$checkFilePath);
diff --git a/modules/install/install.view.php b/modules/install/install.view.php
index 38e34fdaa..e8b79ef45 100644
--- a/modules/install/install.view.php
+++ b/modules/install/install.view.php
@@ -124,6 +124,19 @@ class installView extends install
$title = sprintf(Context::getLang('input_dbinfo_by_dbtype'), Context::get('db_type'));
Context::set('title', $title);
+
+ $error_return_url = getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type'));
+ if($_SERVER['HTTPS'] == 'on')
+ {
+ // Error occured when using https protocol at "ModuleHandler::init() '
+ $parsedUrl = parse_url($error_return_url);
+ $error_return_url = '';
+ if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
+ if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query'];
+ if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment'];
+ }
+ Context::set('error_return_url', $error_return_url);
+
$this->setTemplateFile($tpl_filename);
}
diff --git a/modules/install/tpl/form.cubrid.html b/modules/install/tpl/form.cubrid.html
index 50285bf91..f3495114f 100644
--- a/modules/install/tpl/form.cubrid.html
+++ b/modules/install/tpl/form.cubrid.html
@@ -7,7 +7,7 @@
{$XE_VALIDATOR_MESSAGE}