SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2022-08-17 02:51:11 +00:00
parent edb3f741fd
commit a058f4dd9e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java
View File

@@ -74,7 +74,9 @@ public class HttpClientConfigurableHttpConnectionFactory implements Configurable
return new HttpClientConnection(url.toString(), null, builder.build());
}
else {
/* No matching builder found: let jGit handle the creation of the HttpClient */
/*
* No matching builder found: let jGit handle the creation of the HttpClient
*/
return new HttpClientConnection(url.toString());
}
}

7
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/support/HttpClientSupport.java
View File

@@ -65,8 +65,11 @@ public final class HttpClientSupport {
httpClientBuilder.setDefaultCredentialsProvider(new SystemDefaultCredentialsProvider());
}
/* According to https://git.eclipse.org/c/jgit/jgit.git/commit/?id=e17bfc96f293744cc5c0cef306e100f53d63bb3d
jGit does its own redirect handling and disables HttpClient's redirect handing. */
/*
* According to https://git.eclipse.org/c/jgit/jgit.git/commit/?id=
* e17bfc96f293744cc5c0cef306e100f53d63bb3d jGit does its own redirect handling
* and disables HttpClient's redirect handing.
*/
httpClientBuilder.disableRedirectHandling();
int timeout = environmentProperties.getTimeout() * 1000;