f6a905
From d9f08c36a39b035ec70a37cb6aac5f980cc57054 Mon Sep 17 00:00:00 2001
f6a905
From: Mikolaj Izdebski <mizdebsk@redhat.com>
f6a905
Date: Tue, 20 Jan 2015 16:04:31 +0100
f6a905
Subject: [PATCH 1/2] Use system copy of effective_tld_names.dat
f6a905
f6a905
---
f6a905
 .../apache/http/conn/util/PublicSuffixMatcherLoader.java   | 7 +++----
f6a905
 1 file changed, 3 insertions(+), 4 deletions(-)
f6a905
f6a905
diff --git a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
f6a905
index 8783c5b..c858220 100644
f6a905
--- a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
f6a905
+++ b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
f6a905
@@ -82,11 +82,10 @@ public final class PublicSuffixMatcherLoader {
f6a905
         if (DEFAULT_INSTANCE == null) {
f6a905
             synchronized (PublicSuffixMatcherLoader.class) {
f6a905
                 if (DEFAULT_INSTANCE == null){
f6a905
-                    final URL url = PublicSuffixMatcherLoader.class.getResource(
f6a905
-                            "/mozilla/public-suffix-list.txt");
f6a905
-                    if (url != null) {
f6a905
+                    final File file = new File("/usr/share/publicsuffix/effective_tld_names.dat");
f6a905
+                    if (file.exists()) {
f6a905
                         try {
f6a905
-                            DEFAULT_INSTANCE = load(url);
f6a905
+                            DEFAULT_INSTANCE = load(file);
f6a905
                         } catch (final IOException ex) {
f6a905
                             // Should never happen
f6a905
                             final Log log = LogFactory.getLog(PublicSuffixMatcherLoader.class);
f6a905
-- 
f6a905
2.19.1
f6a905