From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 26 Mar 2019 18:51:26 +0000 (+0000)
Subject: Merge "rdbms: Use correct value for 'sslmode' in DatabasePostgres"
X-Git-Tag: 1.34.0-rc.0~2339
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=4905504faded8f85a9b3d68b27da5c9e2f11bd06;hp=0a6d507ed0871dba1f9baa4cc22dfcac34b047dd

Merge "rdbms: Use correct value for 'sslmode' in DatabasePostgres"
---

diff --git a/includes/libs/rdbms/database/DatabasePostgres.php b/includes/libs/rdbms/database/DatabasePostgres.php
index 481dd9a6be..4ae41047b0 100644
--- 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['sslmode'] = 1;
+			$connectVars['sslmode'] = 'require';
 		}
 
 		$this->connectString = $this->makeConnectionString( $connectVars );