diff options
author | Simon McVittie <smcv@debian.org> | 2014-10-05 22:56:55 +0100 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2014-10-05 23:49:37 +0100 |
commit | d712389ae3e8351c1416aa81d4b85586cf98f002 (patch) | |
tree | 061c5a01b27288baa7b90d96fab19dd1513ee3bd /t/urlto.t | |
parent | 5014a091ba14a6ecf05cfc5f5ae67331b506b348 (diff) | |
download | ikiwiki-d712389ae3e8351c1416aa81d4b85586cf98f002.tar ikiwiki-d712389ae3e8351c1416aa81d4b85586cf98f002.tar.gz |
Avoid mixed content when cgiurl is https but url is not
Diffstat (limited to 't/urlto.t')
-rwxr-xr-x | t/urlto.t | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -50,11 +50,13 @@ is(IkiWiki::baseurl(undef), "//example.co.uk/~smcv/"); is(IkiWiki::urlto('stoats', undef), "//example.co.uk/~smcv/stoats/"); is(IkiWiki::urlto('', undef), "//example.co.uk/~smcv/"); -# with url and cgiurl on different schemes, "local" degrades to absolute +# with url and cgiurl on different schemes, "local" degrades to absolute for +# CGI but protocol-relative for static content, to avoid the CGI having +# mixed content $IkiWiki::config{url} = "http://example.co.uk/~smcv"; $IkiWiki::config{cgiurl} = "https://dynamic.example.co.uk/~smcv/ikiwiki.cgi"; is(IkiWiki::checkconfig(), 1); is(IkiWiki::cgiurl(), "https://dynamic.example.co.uk/~smcv/ikiwiki.cgi"); -is(IkiWiki::baseurl(undef), "http://example.co.uk/~smcv/"); -is(IkiWiki::urlto('stoats', undef), "http://example.co.uk/~smcv/stoats/"); -is(IkiWiki::urlto('', undef), "http://example.co.uk/~smcv/"); +is(IkiWiki::baseurl(undef), "//example.co.uk/~smcv/"); +is(IkiWiki::urlto('stoats', undef), "//example.co.uk/~smcv/stoats/"); +is(IkiWiki::urlto('', undef), "//example.co.uk/~smcv/"); |