From: Joey Hess <joey@kitenet.net>
Date: Mon, 20 Sep 2010 00:15:38 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100926~14
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/012300404e86578e24ab3f07ded9f1ba89c39b2a?hp=2745dfee60fa890ed0ecb8f53528e8a8a0803066

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 5941e3f3f..5cfa72833 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -198,8 +198,12 @@ sub preprocess (@) {
 				'" rel="openid2.local_id" />' if $delegate ne 1;
 		}
 		if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) {
-			push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.
-				'content="'.encode_entities($params{"xrds-location"}).'" />';
+			# force url absolute
+			eval q{use URI};
+			error($@) if $@;
+			my $url=URI->new_abs($params{"xrds-location"}, $config{url});
+			push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location" '.
+				'content="'.encode_entities($url).'" />';
 		}
 	}
 	elsif ($key eq 'redir') {
diff --git a/debian/changelog b/debian/changelog
index 8286b7887..24115c177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100916) UNRELEASED; urgency=low
+
+  * meta: Ensure that the url specified by xrds-location is absolute.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 19 Sep 2010 20:13:06 -0400
+
 ikiwiki (3.20100915) unstable; urgency=low
 
   * needsbuild hook interface changed; the hooks should now return