Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
fe007d92
Commit
fe007d92
authored
Mar 11, 2017
by
Steve Müller
Committed by
GitHub
Mar 11, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2669 from fsok/add_pgsql_ssl_params
Add missing SSL parameters to pdo_pgsql driver
parents
098d54cf
a7eb74ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
+20
-0
configuration.rst
docs/en/reference/configuration.rst
+8
-0
Driver.php
lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
+12
-0
No files found.
docs/en/reference/configuration.rst
View file @
fe007d92
...
@@ -266,6 +266,14 @@ pdo\_pgsql
...
@@ -266,6 +266,14 @@ pdo\_pgsql
the server's certificate will be verified to be signed by one of these
the server's certificate will be verified to be signed by one of these
authorities.
authorities.
See http://www.postgresql.org/docs/9.0/static/libpq-connect.html#LIBPQ-CONNECT-SSLROOTCERT
See http://www.postgresql.org/docs/9.0/static/libpq-connect.html#LIBPQ-CONNECT-SSLROOTCERT
- ``sslcert`` (string): specifies the file name of the client SSL certificate.
See `https://www.postgresql.org/docs/9.1/static/libpq-connect.html#LIBPQ-CONNECT-SSLCERT`
- ``sslkey`` (string): specifies the location for the secret key used for the
client certificate.
See `https://www.postgresql.org/docs/9.1/static/libpq-connect.html#LIBPQ-CONNECT-SSLKEY`
- ``sslcrl`` (string): specifies the file name of the SSL certificate
revocation list (CRL).
See `https://www.postgresql.org/docs/9.1/static/libpq-connect.html#LIBPQ-CONNECT-SSLCRL`
- ``application_name`` (string): Name of the application that is
- ``application_name`` (string): Name of the application that is
connecting to database. Optional. It will be displayed at ``pg_stat_activity``.
connecting to database. Optional. It will be displayed at ``pg_stat_activity``.
...
...
lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
View file @
fe007d92
...
@@ -105,6 +105,18 @@ class Driver extends AbstractPostgreSQLDriver
...
@@ -105,6 +105,18 @@ class Driver extends AbstractPostgreSQLDriver
$dsn
.=
'sslrootcert='
.
$params
[
'sslrootcert'
]
.
';'
;
$dsn
.=
'sslrootcert='
.
$params
[
'sslrootcert'
]
.
';'
;
}
}
if
(
isset
(
$params
[
'sslcert'
]))
{
$dsn
.=
'sslcert='
.
$params
[
'sslcert'
]
.
';'
;
}
if
(
isset
(
$params
[
'sslkey'
]))
{
$dsn
.=
'sslkey='
.
$params
[
'sslkey'
]
.
';'
;
}
if
(
isset
(
$params
[
'sslcrl'
]))
{
$dsn
.=
'sslcrl='
.
$params
[
'sslcrl'
]
.
';'
;
}
if
(
isset
(
$params
[
'application_name'
]))
{
if
(
isset
(
$params
[
'application_name'
]))
{
$dsn
.=
'application_name='
.
$params
[
'application_name'
]
.
';'
;
$dsn
.=
'application_name='
.
$params
[
'application_name'
]
.
';'
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment