Skip to content

Commit 10c2bae

Browse files
authored
Merge pull request #781 from Leprechaunz/ssl_on
Enable 'ssl_on' param for 'ssl' scheme extension
2 parents 736b98f + 2c67c77 commit 10c2bae

File tree

2 files changed

+31
-2
lines changed

2 files changed

+31
-2
lines changed

pkg/amqp-tools/ConnectionConfig.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class ConnectionConfig
4949
private $config;
5050

5151
/**
52-
* @var array|null|string
52+
* @var array|string|null
5353
*/
5454
private $inputConfig;
5555

@@ -391,7 +391,10 @@ private function parseDsn($dsn)
391391
}
392392

393393
$sslOn = false;
394-
if ('amqps' === $dsn->getSchemeProtocol() || in_array('tls', $dsn->getSchemeExtensions(), true)) {
394+
$isAmqps = 'amqps' === $dsn->getSchemeProtocol();
395+
$isTls = in_array('tls', $dsn->getSchemeExtensions(), true);
396+
$isSsl = in_array('ssl', $dsn->getSchemeExtensions(), true);
397+
if ($isAmqps || $isTls || $isSsl) {
395398
$sslOn = true;
396399
}
397400

pkg/amqp-tools/Tests/ConnectionConfigTest.php

+26
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,32 @@ public static function provideConfigs()
266266
],
267267
];
268268

269+
yield [
270+
'amqp+ssl:',
271+
[
272+
'host' => 'localhost',
273+
'port' => 5672,
274+
'vhost' => '/',
275+
'user' => 'guest',
276+
'pass' => 'guest',
277+
'read_timeout' => 3.,
278+
'write_timeout' => 3.,
279+
'connection_timeout' => 3.,
280+
'persisted' => false,
281+
'lazy' => true,
282+
'qos_prefetch_size' => 0,
283+
'qos_prefetch_count' => 1,
284+
'qos_global' => false,
285+
'heartbeat' => 0.0,
286+
'ssl_on' => true,
287+
'ssl_verify' => true,
288+
'ssl_cacert' => '',
289+
'ssl_cert' => '',
290+
'ssl_key' => '',
291+
'ssl_passphrase' => '',
292+
],
293+
];
294+
269295
yield [
270296
'amqp://user:pass@host:10000/vhost',
271297
[

0 commit comments

Comments
 (0)