From 8063b960ade41a089d859b655ff26fb61fb18d3f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 19 Sep 2010 20:15:34 -0400
Subject: meta: Ensure that the url specified by xrds-location is absolute.

With a relative xrds-location, the openid perl client module will fail.
I haven't checked the specs to see if it needs to be absolute, but all
examples I've seen are absolute, so it seems a very good idea.
---
 IkiWiki/Plugin/meta.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index ae593555e..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"})) {
+			# 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($params{"xrds-location"}).'" />';
+				'content="'.encode_entities($url).'" />';
 		}
 	}
 	elsif ($key eq 'redir') {
-- 
cgit v1.2.3