32 lines
1.6 KiB
Diff
32 lines
1.6 KiB
Diff
From b4954ca99dcc6daa344c9223a5997487e0806605 Mon Sep 17 00:00:00 2001
|
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
Date: Tue, 20 Jan 2015 16:04:31 +0100
|
|
Subject: [PATCH] Use system copy of effective_tld_names.dat
|
|
|
|
---
|
|
.../java/org/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 173763a..d792eca 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
|
|
@@ -80,11 +80,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 (IOException ex) {
|
|
// Should never happen
|
|
final Log log = LogFactory.getLog(PublicSuffixMatcherLoader.class);
|
|
--
|
|
2.1.0
|
|
|