diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/Proxy.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java index 5d48b931289d..033332c2b936 100644 --- a/core/java/android/net/Proxy.java +++ b/core/java/android/net/Proxy.java @@ -90,8 +90,10 @@ public final class Proxy { private static final Pattern HOSTNAME_PATTERN; - private static final String EXCLLIST_REGEXP = "$|^(.?" + NAME_IP_REGEX - + ")+(,(.?" + NAME_IP_REGEX + "))*$"; + private static final String EXCL_REGEX = + "[a-zA-Z0-9*]+(\\-[a-zA-Z0-9*]+)*(\\.[a-zA-Z0-9*]+(\\-[a-zA-Z0-9*]+)*)*"; + + private static final String EXCLLIST_REGEXP = "^$|^" + EXCL_REGEX + "(," + EXCL_REGEX + ")*$"; private static final Pattern EXCLLIST_PATTERN; |