mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-09 16:17:48 +02:00
Code Issues Releases Wiki Activity

Elasticsearch: Support HTTPS by inputting https://server (bug #446)

Browse Source
This commit is contained in:
Jakub Vrana
2017-02-20 18:06:14 +01:00
parent fa09eba15e
commit 9df33e82e6
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
adminer/drivers/elastic.inc.php
View File

@@ -59,7 +59,8 @@ if (isset($_GET["elastic"])) {
} }
function connect($server, $username, $password) { 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(''); $return = $this->query('');
if ($return) { if ($return) {
$this->server_info = $return['version']['number']; $this->server_info = $return['version']['number'];

1
changes.txt
View File

@@ -7,6 +7,7 @@ MySQL: Support spatial indexes
PostgreSQL: Export PostgreSQL: Export
PostgreSQL: Don't treat partial indexes as unique PostgreSQL: Don't treat partial indexes as unique
MS SQL: Support pdo_dblib MS SQL: Support pdo_dblib
Elasticsearch: Support HTTPS by inputting https://server
Adminer 4.2.5 (released 2016-06-01): Adminer 4.2.5 (released 2016-06-01):
Fix remote execution in SQLite query Fix remote execution in SQLite query