aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-04-12 14:49:01 +0200
committerMario <mario@mariovavti.com>2019-04-12 14:49:01 +0200
commit064f93185cf4204df2afa7ce23f8fe2dc8ce26ae (patch)
tree23acb0a4bec5d0d074ac9969adb27b5239b05ece
parent4b5922f65291f33657cb76b6689d3613d664cd5f (diff)
parent775285cdf8faebb77e1725e7c88de82129acd3c4 (diff)
downloadvolse-hubzilla-064f93185cf4204df2afa7ce23f8fe2dc8ce26ae.tar.gz
volse-hubzilla-064f93185cf4204df2afa7ce23f8fe2dc8ce26ae.tar.bz2
volse-hubzilla-064f93185cf4204df2afa7ce23f8fe2dc8ce26ae.zip
Merge branch 'dev' into 'dev'
Fix use UNIX socket file to connect DB See merge request hubzilla/core!1587
-rwxr-xr-xinclude/dba/dba_pdo.php2
-rwxr-xr-xinstall/htconfig.sample.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php
index 5002f53e7..a70e4a1d7 100755
--- a/include/dba/dba_pdo.php
+++ b/include/dba/dba_pdo.php
@@ -19,7 +19,7 @@ class dba_pdo extends dba_driver {
$this->driver_dbtype = $scheme;
if(strpbrk($server,':;')) {
- $dsn = $server;
+ $dsn = $this->driver_dbtype . ':unix_socket=' . trim($server, ':;');
}
else {
$dsn = $this->driver_dbtype . ':host=' . $server . (intval($port) ? ';port=' . $port : '');
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index 07725e3f4..509942530 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -12,7 +12,7 @@
// Then set the following for your MySQL installation
-$db_host = 'your.mysqlhost.com'; // Use 'localhost' if you aren't using a remote server
+$db_host = 'your.mysqlhost.com'; // Use 'localhost' or ':/path/to/socket.file' if you aren't using a remote server
$db_port = 0; // leave 0 for default or set your port
$db_user = 'mysqlusername';
$db_pass = 'mysqlpassword';