From fed74f05fc412c27fded7fa5ed904978e681ac0b Mon Sep 17 00:00:00 2001 From: Athou Date: Tue, 19 Aug 2014 01:05:24 +0200 Subject: [PATCH] revert to using a static user agent, fixes issues with some sites refusing our http requests --- CHANGELOG | 1 - src/main/java/com/commafeed/backend/HttpGetter.java | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index defdb549..2a1c57d6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,7 +7,6 @@ v 2.0.2 - fields autocomplete is disabled on the profile page - users are able to delete their account again - chinese and malaysian translation files are now correctly loaded - - software version in user-agent when fetching feeds is no longer hardcoded - admin settings page is now read only, settings are configured in config.yml - added link to metrics on the admin settings page - Rome (rss library) upgrade to 1.5.0 diff --git a/src/main/java/com/commafeed/backend/HttpGetter.java b/src/main/java/com/commafeed/backend/HttpGetter.java index 85b85d6d..a1552f29 100644 --- a/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/src/main/java/com/commafeed/backend/HttpGetter.java @@ -48,8 +48,6 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import com.commafeed.CommaFeedConfiguration; - /** * Smart HTTP getter: handles gzip, ssl, last modified and etag headers * @@ -59,6 +57,7 @@ import com.commafeed.CommaFeedConfiguration; @Singleton public class HttpGetter { + private static final String USER_AGENT = "CommaFeed/2.0 (http://www.commafeed.com)"; private static final String ACCEPT_LANGUAGE = "en"; private static final String PRAGMA_NO_CACHE = "No-cache"; private static final String CACHE_CONTROL_NO_CACHE = "no-cache"; @@ -99,12 +98,6 @@ public class HttpGetter { } } - private String userAgent; - - public HttpGetter(CommaFeedConfiguration config) { - this.userAgent = String.format("CommaFeed/%s (https://www.commafeed.com)", config.getVersion()); - } - public HttpResult getBinary(String url, int timeout) throws ClientProtocolException, IOException, NotModifiedException { return getBinary(url, null, null, timeout); } @@ -137,7 +130,7 @@ public class HttpGetter { httpget.addHeader(HttpHeaders.ACCEPT_LANGUAGE, ACCEPT_LANGUAGE); httpget.addHeader(HttpHeaders.PRAGMA, PRAGMA_NO_CACHE); httpget.addHeader(HttpHeaders.CACHE_CONTROL, CACHE_CONTROL_NO_CACHE); - httpget.addHeader(HttpHeaders.USER_AGENT, userAgent); + httpget.addHeader(HttpHeaders.USER_AGENT, USER_AGENT); if (lastModified != null) { httpget.addHeader(HttpHeaders.IF_MODIFIED_SINCE, lastModified);