Merge pull request #58 from nlevitt/ari-3723

vonrosen · vonrosen · commit 63c4264de6f8 · 2014-04-10T12:09:16.000-07:00
for ARI-3723, accept speculative urls with query params with no value
diff --git a/commons/src/main/java/org/archive/util/UriUtils.java b/commons/src/main/java/org/archive/util/UriUtils.java
@@ -380,7 +380,7 @@ public static String speculativeFixup(String candidate, UURI base) {
                         "tt", "u", "ul", "var", "video", "wbr"));
     }
 
-    protected static final String QNV = "[a-zA-Z_]+=(?:[\\w-/.]|%[0-9a-fA-F]{2})+"; // name=value for query strings 
+    protected static final String QNV = "[a-zA-Z_]+=(?:[\\w-/.]|%[0-9a-fA-F]{2})*"; // name=value for query strings
     protected static final String VERY_LIKELY_RELATIVE_URI_PATTERN = 
             "(?:\\.?/)?"                                    // may start with "/" or "./"
             + "(?:(?:[\\w-]+|\\.\\.)/)*"                    // may have path/segments/

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ public static String speculativeFixup(String candidate, UURI base) {`
`380`	`380`	`"tt", "u", "ul", "var", "video", "wbr"));`
`381`	`381`	`}`
`382`	`382`
`383`		`- protected static final String QNV = "[a-zA-Z_]+=(?:[\\w-/.]\|%[0-9a-fA-F]{2})+"; // name=value for query strings`
	`383`	`+ protected static final String QNV = "[a-zA-Z_]+=(?:[\\w-/.]\|%[0-9a-fA-F]{2})*"; // name=value for query strings`
`384`	`384`	`protected static final String VERY_LIKELY_RELATIVE_URI_PATTERN =`
`385`	`385`	`"(?:\\.?/)?" // may start with "/" or "./"`
`386`	`386`	`+ "(?:(?:[\\w-]+\|\\.\\.)/)*" // may have path/segments/`