get connection from pool to send digest auth response (#26733)

wfurt · web-flow · commit c727d1226a88 · 2018-02-02T10:15:47.000-08:00
* get connection from pool to send digest auth response
* fix incorrect comment.
* s/TBD/TODO/
diff --git a/src/System.Net.Http/src/System/Net/Http/Managed/HttpProxyConnectionHandler.cs b/src/System.Net.Http/src/System/Net/Http/Managed/HttpProxyConnectionHandler.cs
@@ -88,6 +88,7 @@ private async Task<HttpResponseMessage> SendWithProxyAsync(
 
                         if (credential != null)
                         {
+                            // TODO #23156: Drain response before disposing.
                             response.Dispose();
 
                             request.Headers.ProxyAuthorization = new AuthenticationHeaderValue(AuthenticationHelper.Basic,
@@ -111,8 +112,9 @@ private async Task<HttpResponseMessage> SendWithProxyAsync(
 
                             if (await AuthenticationHelper.TrySetDigestAuthToken(request, credential, digestResponse, HttpKnownHeaderNames.ProxyAuthorization).ConfigureAwait(false))
                             {
+                                // TODO #23156: Drain response before disposing.
                                 response.Dispose();
-                                response = await _innerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false);
+                                response = await GetConnectionAndSendAsync(request, proxyUri, cancellationToken).ConfigureAwait(false);
 
                                 // Retry in case of nonce timeout in server.
                                 if (response.StatusCode == HttpStatusCode.ProxyAuthenticationRequired)

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ private async Task<HttpResponseMessage> SendWithProxyAsync(`
`88`	`88`
`89`	`89`	`if (credential != null)`
`90`	`90`	`{`
	`91`	`+ // TODO #23156: Drain response before disposing.`
`91`	`92`	`response.Dispose();`
`92`	`93`
`93`	`94`	`request.Headers.ProxyAuthorization = new AuthenticationHeaderValue(AuthenticationHelper.Basic,`
`@@ -111,8 +112,9 @@ private async Task<HttpResponseMessage> SendWithProxyAsync(`
`111`	`112`
`112`	`113`	`if (await AuthenticationHelper.TrySetDigestAuthToken(request, credential, digestResponse, HttpKnownHeaderNames.ProxyAuthorization).ConfigureAwait(false))`
`113`	`114`	`{`
	`115`	`+ // TODO #23156: Drain response before disposing.`
`114`	`116`	`response.Dispose();`
`115`		`- response = await _innerHandler.SendAsync(request, cancellationToken).ConfigureAwait(false);`
	`117`	`+ response = await GetConnectionAndSendAsync(request, proxyUri, cancellationToken).ConfigureAwait(false);`
`116`	`118`
`117`	`119`	`// Retry in case of nonce timeout in server.`
`118`	`120`	`if (response.StatusCode == HttpStatusCode.ProxyAuthenticationRequired)`