Skip to content

Commit 0291b3a

Browse files
committed
Merge branch '3.0'
* 3.0: (22 commits) [Yaml] Fix tests on PHP 7.0.2 [FrameworkBundle] Don't log twice with the error handler [2.7] Workaround https://bugs.php.net/63206 [2.3] Workaround https://bugs.php.net/63206 Add closing parenthesis [Serializer] Unset object_to_populate after using it Typo fix [WebProfiler] Fixed sf-minitoolbar height [HttpFoundation] Fixed Request HTTP_USER_AGENT on 3.X versions [2.3] Static Code Analysis for Components [Serializer] Use $context['cache_key'] to enhance caching Removed non-existent directory from composer autoload Fixed erroneous deprecation notice for extended Interfaces [Routing] cs fix Added support \IteratorAggregate for UniqueEntityValidator Update AbstractChoiceListTest.php [Serializer] Allow to use proxies in object_to_populate Fix #17306 Paths with % in it are note allowed (like urlencoded) Use proper class to fetch $versionStrategy property Added sort order SORT_STRING for params in UriSigner ... Conflicts: src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
2 parents e258134 + a96f921 commit 0291b3a

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

Firewall/DigestAuthenticationListener.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,8 @@ public function validateAndDecode($entryPointKey, $expectedRealm)
170170
throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s" (%s)', $this->header, implode(', ', $keys)));
171171
}
172172

173-
if ('auth' === $this->elements['qop']) {
174-
if (!isset($this->elements['nc']) || !isset($this->elements['cnonce'])) {
175-
throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s"', $this->header));
176-
}
173+
if ('auth' === $this->elements['qop'] && !isset($this->elements['nc'], $this->elements['cnonce'])) {
174+
throw new BadCredentialsException(sprintf('Missing mandatory digest value; received header "%s"', $this->header));
177175
}
178176

179177
if ($expectedRealm !== $this->elements['realm']) {

0 commit comments

Comments
 (0)