Skip to content

Commit a3531b6

Browse files
committed
Use default redirect strategy handling PROPFIND just fine.
1 parent 5b1b208 commit a3531b6

2 files changed

Lines changed: 8 additions & 57 deletions

File tree

src/main/java/com/github/sardine/impl/SardineImpl.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.apache.hc.client5.http.config.RequestConfig;
3636
import org.apache.hc.client5.http.cookie.CookieSpecFactory;
3737
import org.apache.hc.client5.http.entity.GzipDecompressingEntity;
38+
import org.apache.hc.client5.http.impl.DefaultRedirectStrategy;
3839
import org.apache.hc.client5.http.impl.DefaultSchemePortResolver;
3940
import org.apache.hc.client5.http.impl.auth.BasicAuthCache;
4041
import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
@@ -47,6 +48,7 @@
4748
import org.apache.hc.client5.http.impl.routing.SystemDefaultRoutePlanner;
4849
import org.apache.hc.client5.http.io.HttpClientConnectionManager;
4950
import org.apache.hc.client5.http.protocol.HttpClientContext;
51+
import org.apache.hc.client5.http.protocol.RedirectStrategy;
5052
import org.apache.hc.client5.http.routing.HttpRoutePlanner;
5153
import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
5254
import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
@@ -1092,7 +1094,7 @@ protected <T> T execute(HttpClientContext context, HttpUriRequestBase request, H
10921094
Integer httpMajorVersion = (Integer) context.getAttribute(HTTP_MAJOR_VERSION);
10931095

10941096
if (httpMajorVersion != null){
1095-
request.setVersion(new ProtocolVersion("HTTP", httpMajorVersion, 0));
1097+
request.setVersion(new ProtocolVersion("HTTP", httpMajorVersion, 0));
10961098
}
10971099
HttpContext requestLocalContext = new BasicHttpContext(context);
10981100
try
@@ -1146,7 +1148,7 @@ protected HttpClientBuilder configure(ProxySelector selector, CredentialsProvide
11461148
return HttpClients.custom()
11471149
.setUserAgent("Sardine/" + version)
11481150
.setDefaultCredentialsProvider(credentials)
1149-
// .setRedirectStrategy(this.createDefaultRedirectStrategy())
1151+
.setRedirectStrategy(this.createDefaultRedirectStrategy())
11501152
.setDefaultRequestConfig(RequestConfig.custom()
11511153
// Only selectively enable this for PUT but not all entity enclosing methods
11521154
.setExpectContinueEnabled(false).build())
@@ -1159,10 +1161,10 @@ protected DefaultSchemePortResolver createDefaultSchemePortResolver()
11591161
return new DefaultSchemePortResolver();
11601162
}
11611163

1162-
// protected SardineRedirectStrategy createDefaultRedirectStrategy()
1163-
// {
1164-
// return new SardineRedirectStrategy();
1165-
// }
1164+
protected RedirectStrategy createDefaultRedirectStrategy()
1165+
{
1166+
return new DefaultRedirectStrategy();
1167+
}
11661168

11671169
/**
11681170
* Creates a new registry for default ports with socket factories.

src/main/java/com/github/sardine/impl/SardineRedirectStrategy.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)