From 46c89afa0fc522c1f6906a72f505ee16f36d2360 Mon Sep 17 00:00:00 2001

From: Mikolaj Izdebski <mizdebsk@redhat.com>

Date: Tue, 20 Jan 2015 16:04:31 +0100

Subject: [PATCH 1/2] Use system copy of effective_tld_names.dat

---

 .../apache/http/conn/util/PublicSuffixMatcherLoader.java   | 7 +++----

 1 file changed, 3 insertions(+), 4 deletions(-)

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

index 8783c5b96..c858220bf 100644

--- a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java

+++ b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java

@@ -82,11 +82,10 @@ public final class PublicSuffixMatcherLoader {

         if (DEFAULT_INSTANCE == null) {

             synchronized (PublicSuffixMatcherLoader.class) {

                 if (DEFAULT_INSTANCE == null){

-                    final URL url = PublicSuffixMatcherLoader.class.getResource(

-                            "/mozilla/public-suffix-list.txt");

-                    if (url != null) {

+                    final File file = new File("/usr/share/publicsuffix/effective_tld_names.dat");

+                    if (file.exists()) {

                         try {

-                            DEFAULT_INSTANCE = load(url);

+                            DEFAULT_INSTANCE = load(file);

                         } catch (final IOException ex) {

                             // Should never happen

                             final Log log = LogFactory.getLog(PublicSuffixMatcherLoader.class);

-- 

2.31.1