diff options
Diffstat (limited to 'doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change')
| -rw-r--r-- | doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change b/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change new file mode 100644 index 000000000..6a128e5df --- /dev/null +++ b/doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change @@ -0,0 +1,120 @@ +[[!meta author="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]] + +[[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]] + +[[!meta permalink="http://ikiwiki.info/recentchanges/#change-d916cd2f71f1c22dad947d7b2134edbbb15e7b8e"]] + +<div id="change-d916cd2f71f1c22dad947d7b2134edbbb15e7b8e" class="metadata"> +<span class="desc"><br />Changed pages:</span> +<span class="pagelinks"> + +<a href="http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn;h=80925b458287767620d8862f782e77b1bd7dda63;hp=4fafc2bbc249ac9e22869129f8702e0a6d54a5ba;hb=d916cd2f71f1c22dad947d7b2134edbbb15e7b8e;hpb=178d6a16c2fff68edfbe6a1af5c8a9fa91db6039" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><a href="http://ikiwiki.info/ikiwiki.cgi?page=todo%2Fwant_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both&do=goto" rel="nofollow">todo/want to avoid ikiwiki using http or https in urls to allow serving both</a> + + +</span> +<span class="desc"><br />Changed by:</span> +<span class="committer"> + +<a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a> + +</span> +<span class="desc"><br />Commit type:</span> +<span class="committype">web</span> +<span class="desc"><br />Date:</span> +<span class="changedate"><span class="relativedate" title="Mon, 22 Nov 2010 19:45:02 +0000">19:45:02 11/22/10</span></span> +<span class="desc"><br /></span> +</div> + +<span class="revert"> +<a href="http://ikiwiki.info/ikiwiki.cgi?rev=d916cd2f71f1c22dad947d7b2134edbbb15e7b8e&do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a> +</span> + +<div class="changelog"> + + +respond to feedback<br /> + + +</div> + +<div class="diff"> +<pre> +diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +index 4fafc2b..80925b4 100644 +--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn ++++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +@@ -191,14 +191,41 @@ New API added by this branch: + > The new form for local urls will typically be only a little bit longer, + > except in the unusual case where the cgiurl is elsewhere. --[[Joey]] + ++ >> So, have urlto(x, y) use `$local_url`? There are few calls, but IMO ++ >> they're for the most important things - wikilinks, img, map and ++ >> other ordinary hyperlinks. Using `$local_url` would be fine for ++ >> webserver-based use, but it does stop you browsing your wiki's ++ >> HTML over `file:///` (unless you set that as the base URL, but ++ >> then you can't move it around), and stops you moving simple ++ >> outputs (like the docwiki!) around. ++ >> ++ >> I personally think breaking the docwiki is enough to block that. ++ >> ++ >> How about this? ++ >> ++ >> * `urlto($link, $page)` with `$page` defined: relative ++ >> * `urlto($link, undef)`: local, starts with `/` ++ >> * `urlto($link)`: also local, as a side-effect ++ >> * `urlto($link, $anything, 1)` (but idiomatically, `$anything` is ++ >> normally undef): absolute, starts with `http[s]://` ++ >> ++ >> --[[smcv]] ++ + * `IkiWiki::baseurl` has a new second argument which works like the + third argument of `urlto` + ++ > I assume you have no objection to this --[[smcv]] ++ + * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1` + ++ > Possibly changed to making this always be local unless `cgiurl => $x` ++ > is given: see below --[[smcv]] ++ + * `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters + except `cgiurl` and/or `local_cgiurl` + ++ > I assume you have no objection to this --[[smcv]] ++ + Bugs: + + * I don't think anything except `openid` calls `cgiurl` without also +@@ -211,10 +238,18 @@ Bugs: + + > I agree that makes sense. --[[Joey]] + ++ >> I'm not completely sure whether you're agreeing with "perhaps do this" ++ >> or "that looks too strange", so please disambiguate: ++ >> would you accept a patch that makes `cgiurl` default to a local ++ >> (starts-with-`/`) result? If you would, that'd reduce the diff. --[[smcv]] ++ + * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being + exported? Perhaps also `IkiWiki::baseurl`? + +- > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] ++ > Possibly, see [[firm_up_plugin_interface]]. --[[Joey]] ++ ++ >> Not really part of this branch, though, so wontfix (unless you ask me ++ >> to do so). --[[smcv]] + + * Or, to reduce use of the unexported `baseurl` function, it might make + sense to give `urlto` a special case that references the root of the wiki, +@@ -227,3 +262,5 @@ Bugs: + + > AFACIS, `baseurl` is only called in 3 places so I don't think that's + > needed. --[[Joey]] ++ ++ >> OK, wontfix. --[[smcv]] + +</pre> +</div> + +<!-- d916cd2f71f1c22dad947d7b2134edbbb15e7b8e --> |