Skip to content

Commit

Permalink
Merge pull request #271 from zoran-rajic/fix_270
Browse files Browse the repository at this point in the history
Fix #270: S3 timeout parameter modifies both connection and inactivity timeouts
  • Loading branch information
Yaguang Wang committed Apr 30, 2015
2 parents bfb0ff9 + 3f3d525 commit 5c75e76
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public void init(Config config, Logger logger) {

ClientConfiguration clientConf = new ClientConfiguration();
clientConf.setConnectionTimeout(timeout);
clientConf.setSocketTimeout(timeout);
// clientConf.setProtocol(Protocol.HTTP);
if((!proxyHost.equals(""))&&(!proxyPort.equals(""))){
clientConf.setProxyHost(proxyHost);
Expand Down

0 comments on commit 5c75e76

Please sign in to comment.