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/07/13 11:04:26 UTC
svn commit: r1835817 - in /jackrabbit/branches/2.16: ./
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Author: reschke
Date: Fri Jul 13 11:04:26 2018
New Revision: 1835817
URL: http://svn.apache.org/viewvc?rev=1835817&view=rev
Log:
JCR-3211: Support HTTP proxy in SPI2DAV (ported to 2.16)
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 13 11:04:26 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831182,1833374
+/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831182,1833374,1834008
Modified: jackrabbit/branches/2.16/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=1835817&r1=1835816&r2=1835817&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Fri Jul 13 11:04:26 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