From 98c6d1a7e00479fc30715bdb848575018b28abcc Mon Sep 17 00:00:00 2001
From: Hunter Stern <hunter@archive.org>
Date: Fri, 20 Mar 2015 15:39:53 -0700
Subject: [PATCH 1/2] Allow backslash path separator to be used for
 canonicalizing url. For https://webarchive.jira.com/browse/ARI-4246

---
 src/main/java/org/archive/url/BasicURLCanonicalizer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/archive/url/BasicURLCanonicalizer.java b/src/main/java/org/archive/url/BasicURLCanonicalizer.java
index c09ad6e6..5f39ce76 100644
--- a/src/main/java/org/archive/url/BasicURLCanonicalizer.java
+++ b/src/main/java/org/archive/url/BasicURLCanonicalizer.java
@@ -74,15 +74,15 @@ public void canonicalize(HandyURL url) {
 		url.setPath(escapeOnce(normalizePath(path)));
 	}
 
-	private static final Pattern SINGLE_FORWARDSLASH_PATTERN = Pattern
-			.compile("/");
+	private static final Pattern SINGLE_FORWARDANDBACKSLASH_PATTERN = Pattern
+			.compile("[/\\\\]");
 
 	public String normalizePath(String path) {
 		if (path == null) {
 			path = "/";
 		} else {
 			// -1 gives an empty trailing element if path ends with '/':
-			String[] paths = SINGLE_FORWARDSLASH_PATTERN.split(path, -1);
+			String[] paths = SINGLE_FORWARDANDBACKSLASH_PATTERN.split(path, -1);
 			ArrayList<String> keptPaths = new ArrayList<String>();
 			boolean first = true;
 			for (String p : paths) {

From 92f434e24e038e4f7c81087023a7463b4a009998 Mon Sep 17 00:00:00 2001
From: Kenji Nagahashi <kenji@archive.org>
Date: Wed, 25 Mar 2015 22:31:54 -0700
Subject: [PATCH 2/2] Changes for local build: - add "-IA" version suffix -
 restore distributionManagement

---
 pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0ed119b8..222a4c78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>org.netpreserve.commons</groupId>
   <artifactId>webarchive-commons</artifactId>
-  <version>1.1.5</version>
+  <version>1.1.5-IA</version>
   <packaging>jar</packaging>
 
   <name>webarchive-commons</name>
@@ -243,7 +243,6 @@
 
   </repositories>
 
-<!--
   <distributionManagement>
     <repository>
       <id>${repository.id}</id>
@@ -254,6 +253,5 @@
       <url>${snapshotRepository.url}</url>
     </snapshotRepository>
   </distributionManagement>
--->
 
 </project>