diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2015-01-07 08:11:49 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2015-01-07 08:11:49 +0100 |
| commit | 19510458cf25009ccf966250eaa2eba937c635ed (patch) | |
| tree | 5a7adc9a7dd3d0b54267aa94386e73664329599a | |
| parent | 9aeb49c3f781c9f32290965c9b14c7d9f6fccf8f (diff) | |
| parent | 088ae576f40f57cca334bae7a590e4889e140e85 (diff) | |
| download | cgeo-19510458cf25009ccf966250eaa2eba937c635ed.zip cgeo-19510458cf25009ccf966250eaa2eba937c635ed.tar.gz cgeo-19510458cf25009ccf966250eaa2eba937c635ed.tar.bz2 | |
Merge branch 'release' into upstream
| -rw-r--r-- | main/src/cgeo/geocaching/network/Network.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/network/Network.java b/main/src/cgeo/geocaching/network/Network.java index 14c44dc..7eb6f61 100644 --- a/main/src/cgeo/geocaching/network/Network.java +++ b/main/src/cgeo/geocaching/network/Network.java @@ -62,7 +62,7 @@ public abstract class Network { static { CLIENT_PARAMS.setParameter(CoreProtocolPNames.HTTP_CONTENT_CHARSET, CharEncoding.UTF_8); CLIENT_PARAMS.setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 30000); - CLIENT_PARAMS.setParameter(CoreConnectionPNames.SO_TIMEOUT, 90000); + CLIENT_PARAMS.setParameter(CoreConnectionPNames.SO_TIMEOUT, 30000); CLIENT_PARAMS.setParameter(ClientPNames.HANDLE_REDIRECTS, true); } |