diff --git a/source/de/anomic/yacy/yacyRelease.java b/source/de/anomic/yacy/yacyRelease.java index 848768193..4e43a7335 100644 --- a/source/de/anomic/yacy/yacyRelease.java +++ b/source/de/anomic/yacy/yacyRelease.java @@ -299,7 +299,7 @@ public final class yacyRelease extends yacyVersion { try { if (this.publicKey != null) { // final byte[] signatureData = Client.wget(this.getUrl().toString() + ".sig", reqHeader, 6000); - final byte[] signatureData = client.GETbytes(this.getUrl().toString()); + final byte[] signatureData = client.GETbytes(this.getUrl().toString() + ".sig"); if (signatureData == null) { Log.logWarning("yacyVersion", "download of signature " + this.getUrl().toString() + " failed. ignoring signature file."); } else try { diff --git a/source/net/yacy/cora/protocol/Client.java b/source/net/yacy/cora/protocol/Client.java index 70dd20c9e..c5e9f09cd 100644 --- a/source/net/yacy/cora/protocol/Client.java +++ b/source/net/yacy/cora/protocol/Client.java @@ -21,7 +21,6 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpHead; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.params.ClientPNames; import org.apache.http.client.params.CookiePolicy; import org.apache.http.client.params.HttpClientParams; import org.apache.http.conn.ClientConnectionManager; @@ -123,12 +122,13 @@ public class Client { final SchemeRegistry schemeRegistry = new SchemeRegistry(); schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); schemeRegistry.register(new Scheme("https", SSLSocketFactory.getSocketFactory(), 443)); + + // cookie policy + HttpClientParams.setCookiePolicy(httpParams, CookiePolicy.BEST_MATCH); ClientConnectionManager clientConnectionManager = new ThreadSafeClientConnManager(httpParams, schemeRegistry); httpClient = new DefaultHttpClient(clientConnectionManager, httpParams); - // cookie policy - httpClient.getParams().setParameter(ClientPNames.COOKIE_POLICY, CookiePolicy.BEST_MATCH); // ask for gzip ((AbstractHttpClient) httpClient).addRequestInterceptor(new GzipRequestInterceptor()); // uncompress gzip