X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FURIimap.pm;h=816449143e75bc10e0fe4e99fc1ab19aa01663f5;hb=HEAD;hp=6907e32a6031db53d0b0e815b2223deb8081ddc3;hpb=076f1322ba8fd0386760fc68a9df9efd34afe4a6;p=public-inbox.git

diff --git a/lib/PublicInbox/URIimap.pm b/lib/PublicInbox/URIimap.pm
index 6907e32a..81644914 100644
--- a/lib/PublicInbox/URIimap.pm
+++ b/lib/PublicInbox/URIimap.pm
@@ -86,7 +86,8 @@ sub uidvalidity { # read/write
 		$$self = uri_join($scheme, $auth, $path, $query, $frag);
 	}
 	$path =~ s!\A/+!!;
-	$path =~ m!\A[^;/]+;UIDVALIDITY=([1-9][0-9]*)\b!i ? ($1 + 0) : undef;
+	$path =~ m!\A[^;]+;UIDVALIDITY=([1-9][0-9]*)\b!i ?
+		($1 + 0) : undef;
 }
 
 sub uid {
@@ -97,11 +98,11 @@ sub uid {
 			$path =~ s!/;UID=[^;/]*\b!!i;
 		} else {
 			$path =~ s!/;UID=[^;/]*\b!/;UID=$val!i or
-				$path .= ";UID=$val";
+				$path .= "/;UID=$val";
 		}
 		$$self = uri_join($scheme, $auth, $path, $query);
 	}
-	$path =~ m!\A/[^/;]+(?:;UIDVALIDITY=[^;/]+)?/;UID=([1-9][0-9]*)\b!i ?
+	$path =~ m!\A/[^;]+(?:;UIDVALIDITY=[^;/]+)?/;UID=([1-9][0-9]*)\b!i ?
 		($1 + 0) : undef;
 }