From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 21 Feb 2024 21:48:42 +0000 (+0100)
Subject: common: omit trailing slash from requestless canonical links
X-Git-Url: http://git.shiar.net/sheet.git/commitdiff_plain/4c28c0f1dd2556ecb920f2cea1785527e6c44a06

common: omit trailing slash from requestless canonical links
---

diff --git a/common.inc.plp b/common.inc.plp
index 8a13059..ee21f02 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -157,7 +157,8 @@ sub Html {
 
 	my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
 
-	if (my $url = $meta->{canonical} // "/$file/$Request") {
+	$meta->{canonical} //= "/$file" . ($Request ne '' && "/$Request");
+	if (my $url = $meta->{canonical}) {
 		$url = "https://sheet.shiar.nl$url";
 		push @{ $meta->{raw} }, qq(<link rel="canonical" href="$url" />);
 	}