Skip to content

Commit def93f2

Browse files
committed
Merge branch '4.4' into 5.4
* 4.4: [HttpFoundation] Always return strings from accept headers decode URL-encoded characters in DSN's usernames/passwords
1 parent 4065cb4 commit def93f2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Transport/Connection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,11 @@ public static function fromDsn(string $dsn, array $options = [], AmqpFactory $am
195195
self::validateOptions($amqpOptions);
196196

197197
if (isset($parsedUrl['user'])) {
198-
$amqpOptions['login'] = $parsedUrl['user'];
198+
$amqpOptions['login'] = urldecode($parsedUrl['user']);
199199
}
200200

201201
if (isset($parsedUrl['pass'])) {
202-
$amqpOptions['password'] = $parsedUrl['pass'];
202+
$amqpOptions['password'] = urldecode($parsedUrl['pass']);
203203
}
204204

205205
if (!isset($amqpOptions['queues'])) {

0 commit comments

Comments
 (0)