Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 83cee1e95bf6 · 2019-11-06T15:14:36.000+01:00
* 4.4:
  conflict with FrameworkBundle &lt; 4.4
  [DoctrineBridge] Reopen DoctrineDataCollector to extensibility
  [HttpClient] fix support for NTLM auth
diff --git a/Response/CurlResponse.php b/Response/CurlResponse.php
@@ -412,7 +412,9 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &
             }
         }
 
-        if ($statusCode < 300 || 400 <= $statusCode || null === $location || curl_getinfo($ch, CURLINFO_REDIRECT_COUNT) === $options['max_redirects']) {
+        if (401 === $statusCode && isset($options['auth_ntlm']) && 0 === strncasecmp($headers['www-authenticate'][0] ?? '', 'NTLM ', 5)) {
+            // Continue with NTLM auth
+        } elseif ($statusCode < 300 || 400 <= $statusCode || null === $location || curl_getinfo($ch, CURLINFO_REDIRECT_COUNT) === $options['max_redirects']) {
             // Headers and redirects completed, time to get the response's content
             $multi->handlesActivity[$id][] = new FirstChunk();
 

Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,9 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &`
`412`	`412`	`}`
`413`	`413`	`}`
`414`	`414`
`415`		`- if ($statusCode < 300 \|\| 400 <= $statusCode \|\| null === $location \|\| curl_getinfo($ch, CURLINFO_REDIRECT_COUNT) === $options['max_redirects']) {`
	`415`	`+ if (401 === $statusCode && isset($options['auth_ntlm']) && 0 === strncasecmp($headers['www-authenticate'][0] ?? '', 'NTLM ', 5)) {`
	`416`	`+ // Continue with NTLM auth`
	`417`	`+ } elseif ($statusCode < 300 \|\| 400 <= $statusCode \|\| null === $location \|\| curl_getinfo($ch, CURLINFO_REDIRECT_COUNT) === $options['max_redirects']) {`
`416`	`418`	`// Headers and redirects completed, time to get the response's content`
`417`	`419`	`$multi->handlesActivity[$id][] = new FirstChunk();`
`418`	`420`