[[!meta author="""joey"""]] [[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]] [[!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-5954915a4fe8a889b8217cac99fae53cbe7f1e97"]]
[[revert|wikiicons/revert.png]]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 80925b4..f8ec4c4 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 @@ -201,6 +201,10 @@ New API added by this branch: >> >> I personally think breaking the docwiki is enough to block that. >> + >>> Well, the docwiki doesn't have an url configured at all, so I assumed + >>> it would need to fall back to current behavior in that case. I had + >>> not thought about browsing wiki's html files though, good point. + >> >> How about this? >> >> * `urlto($link, $page)` with `$page` defined: relative @@ -210,12 +214,24 @@ New API added by this branch: >> normally undef): absolute, starts with `http[s]://` >> >> --[[smcv]] + >> + >>> That makes a great deal of sense, bravo for actually removing + >>> parameters in the common case while maintaining backwards + >>> compatability! + >>> + >>> It does highlight that it would be better to have a + >>> `absolute_urlto($link)` (or maybe `absolute(urlto($link))` ) + >>> rather than the 3 parameter form. --[[Joey]] * `IkiWiki::baseurl` has a new second argument which works like the third argument of `urlto` > I assume you have no objection to this --[[smcv]] + >> It's so little used that I don't really care if it's a bit ugly. + >> (But I assume changes to `urlto` will follow through here anyway.) + >> --[[Joey]] + * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl => 1` > Possibly changed to making this always be local unless `cgiurl => $x` @@ -225,6 +241,8 @@ New API added by this branch: except `cgiurl` and/or `local_cgiurl` > I assume you have no objection to this --[[smcv]] + > + >> Nod, although I don't know of a use case. --[[Joey]] Bugs: @@ -243,6 +261,10 @@ Bugs: >> would you accept a patch that makes `cgiurl` default to a local >> (starts-with-`/`) result? If you would, that'd reduce the diff. --[[smcv]] + >>> Yes, I absolutely think it should default to local. (Note that + >>> if `absolute()` were implemented as suggested above, it could also + >>> be used with cgiurl if necessary.) --[[Joey]] + * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being exported? Perhaps also `IkiWiki::baseurl`?