dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "rdbms: Use correct value for 'sslmode' in DatabasePostgres"
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
database
/
DatabasePostgres.php
diff --git
a/includes/libs/rdbms/database/DatabasePostgres.php
b/includes/libs/rdbms/database/DatabasePostgres.php
index
8aec1ac
..
4ae4104
100644
(file)
--- a/
includes/libs/rdbms/database/DatabasePostgres.php
+++ b/
includes/libs/rdbms/database/DatabasePostgres.php
@@
-116,7
+116,7
@@
class DatabasePostgres extends Database {
$connectVars['port'] = (int)$this->port;
}
if ( $this->flags & self::DBO_SSL ) {
$connectVars['port'] = (int)$this->port;
}
if ( $this->flags & self::DBO_SSL ) {
- $connectVars['sslmode'] =
1
;
+ $connectVars['sslmode'] =
'require'
;
}
$this->connectString = $this->makeConnectionString( $connectVars );
}
$this->connectString = $this->makeConnectionString( $connectVars );
@@
-1346,10
+1346,6
@@
SQL;
return [ $startOpts, $useIndex, $preLimitTail, $postLimitTail, $ignoreIndex ];
}
return [ $startOpts, $useIndex, $preLimitTail, $postLimitTail, $ignoreIndex ];
}
- public function getServer() {
- return $this->server;
- }
-
public function buildConcat( $stringList ) {
return implode( ' || ', $stringList );
}
public function buildConcat( $stringList ) {
return implode( ' || ', $stringList );
}