Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2024-10-29 23:04:05 +01:00
parent 9e3371ef07 022fdcd67e
commit a1f6098158
6 changed files with 71 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
View File

@@ -237,7 +237,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
@Override
@SuppressWarnings("deprecation")
@SuppressWarnings("deprecation") // HttpClientContext.REQUEST_CONFIG
public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
HttpClient client = getHttpClient();
@@ -249,9 +249,10 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
}
// Request configuration not set in the context
if (context.getAttribute(HttpClientContext.REQUEST_CONFIG) == null) {
// Use request configuration given by the user, when available
if (!(context instanceof HttpClientContext clientContext && clientContext.getRequestConfig() != null) &&
context.getAttribute(HttpClientContext.REQUEST_CONFIG) == null) {
RequestConfig config = null;
// Use request configuration given by the user, when available
if (httpRequest instanceof Configurable configurable) {
config = configurable.getConfig();
}
@@ -259,6 +260,9 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
config = createRequestConfig(client);
}
if (config != null) {
if (context instanceof HttpClientContext clientContext) {
clientContext.setRequestConfig(config);
}
context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
}
}