You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/06/21 12:45:48 UTC
svn commit: r1834008 -
/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Author: reschke
Date: Thu Jun 21 12:45:48 2018
New Revision: 1834008
URL: http://svn.apache.org/viewvc?rev=1834008&view=rev
Log:
JCR-3211: Support HTTP proxy in SPI2DAV
Modified:
jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=1834008&r1=1834007&r2=1834008&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Thu Jun 21 12:45:48 2018
@@ -346,7 +346,12 @@ public class RepositoryServiceImpl imple
cmgr.setDefaultMaxPerRoute(maximumHttpConnections);
cmgr.setMaxTotal(maximumHttpConnections);
}
- httpClientBuilder = HttpClients.custom().setConnectionManager(cmgr);
+ HttpClientBuilder hcb = HttpClients.custom().setConnectionManager(cmgr);
+ if (Boolean.getBoolean("jackrabbit.client.useSystemProperties")) {
+ // support Java system proxy? (JCR-3211)
+ hcb = hcb.useSystemProperties();
+ }
+ httpClientBuilder = hcb;
// This configuration of the clients cache assumes that the level of
// concurrency on this map will be equal to the default number of maximum