From 9df33e82e60b341b17a5fa651fbecab574bdbd31 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Mon, 20 Feb 2017 18:06:14 +0100 Subject: [PATCH] Elasticsearch: Support HTTPS by inputting https://server (bug #446) --- adminer/drivers/elastic.inc.php | 3 ++- changes.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/adminer/drivers/elastic.inc.php b/adminer/drivers/elastic.inc.php index 0b6d3ec8..c6398d48 100644 --- a/adminer/drivers/elastic.inc.php +++ b/adminer/drivers/elastic.inc.php @@ -59,7 +59,8 @@ if (isset($_GET["elastic"])) { } function connect($server, $username, $password) { - $this->_url = "http://$username:$password@$server/"; + preg_match('~^(https?://)?(.+)~', $server, $match); + $this->_url = ($match[1] ? $match[1] : "http://") . "$username:$password@$match[2]/"; $return = $this->query(''); if ($return) { $this->server_info = $return['version']['number']; diff --git a/changes.txt b/changes.txt index 18ebbc60..dacdf68f 100644 --- a/changes.txt +++ b/changes.txt @@ -7,6 +7,7 @@ MySQL: Support spatial indexes PostgreSQL: Export PostgreSQL: Don't treat partial indexes as unique MS SQL: Support pdo_dblib +Elasticsearch: Support HTTPS by inputting https://server Adminer 4.2.5 (released 2016-06-01): Fix remote execution in SQLite query