summaryrefslogtreecommitdiff
path: root/doc/recentchanges/change_178d6a16c2fff68edfbe6a1af5c8a9fa91db6039._change
blob: 0e44d6398e6b92a306d00786e80a1e65967107e3 (plain)
  1. [[!meta author="""joey"""]]
  2. [[!meta authorurl="""http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&do=goto"""]]
  3. [[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
  4. [[!meta permalink="http://ikiwiki.info/recentchanges/#change-178d6a16c2fff68edfbe6a1af5c8a9fa91db6039"]]
  5. <div id="change-178d6a16c2fff68edfbe6a1af5c8a9fa91db6039" class="metadata">
  6. <span class="desc"><br />Changed pages:</span>
  7. <span class="pagelinks">
  8. <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=4fafc2bbc249ac9e22869129f8702e0a6d54a5ba;hp=20d22b9ab837dfc3d5c9e0a787479b49fd2d6043;hb=178d6a16c2fff68edfbe6a1af5c8a9fa91db6039;hpb=a6c3d71787c528888c3f66c7ded8dd0c8f430b7e" 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&amp;do=goto" rel="nofollow">todo/want to avoid ikiwiki using http or https in urls to allow serving both</a>
  9. </span>
  10. <span class="desc"><br />Changed by:</span>
  11. <span class="committer">
  12. <a href="http://ikiwiki.info/ikiwiki.cgi?page=users%2Fjoey&amp;do=goto" rel="nofollow">joey</a>
  13. </span>
  14. <span class="desc"><br />Commit type:</span>
  15. <span class="committype">git</span>
  16. <span class="desc"><br />Date:</span>
  17. <span class="changedate"><span class="relativedate" title="Mon, 22 Nov 2010 18:05:37 +0000">18:05:37 11/22/10</span></span>
  18. <span class="desc"><br /></span>
  19. </div>
  20. <span class="revert">
  21. <a href="http://ikiwiki.info/ikiwiki.cgi?rev=178d6a16c2fff68edfbe6a1af5c8a9fa91db6039&amp;do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a>
  22. </span>
  23. <div class="changelog">
  24. comments (finally)<br />
  25. </div>
  26. <div class="diff">
  27. <pre>
  28. 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
  29. index 20d22b9..4fafc2b 100644
  30. --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
  31. +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
  32. @@ -181,6 +181,16 @@ New API added by this branch:
  33. * `urlto(x, y, &#39;local&#39;)` uses `$local_url` instead of `$config{url}`
  34. + &gt; Yikes. I see why you wanted to keep it to 3 parameters (4 is too many,
  35. + &gt; and po overrides it), but I dislike overloading the third parameter
  36. + &gt; like that.
  37. + &gt;
  38. + &gt; There are fairly few calls to `urlto($foo, $bar)`, so why not
  39. + &gt; make that always return the semi-local url form, and leave the third
  40. + &gt; parameter for the cases that need a true fully-qualified url.
  41. + &gt; The new form for local urls will typically be only a little bit longer,
  42. + &gt; except in the unusual case where the cgiurl is elsewhere. --&#91;&#91;Joey&#93;&#93;
  43. +
  44. * `IkiWiki::baseurl` has a new second argument which works like the
  45. third argument of `urlto`
  46. @@ -199,9 +209,13 @@ Bugs:
  47. `cgiurl(cgiurl =&gt; $config{cgiurl}, ...)`,
  48. although that does look a bit strange
  49. + &gt; I agree that makes sense. --&#91;&#91;Joey&#93;&#93;
  50. +
  51. * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
  52. exported? Perhaps also `IkiWiki::baseurl`?
  53. + &gt; Possibly, see &#91;&#91;firm_up_plugin_interface&#93;&#93;. --&#91;&#91;Joey&#93;&#93;
  54. +
  55. * Or, to reduce use of the unexported `baseurl` function, it might make
  56. sense to give `urlto` a special case that references the root of the wiki,
  57. with a trailing slash ready to append stuff: perhaps `urlto(&#39;/&#39;)`,
  58. @@ -210,3 +224,6 @@ Bugs:
  59. do_something(baseurl =&gt; urlto(&#39;/&#39;, undef, local)`);
  60. do_something_else(urlto(&#39;/&#39;).&#39;style.css&#39;);
  61. IkiWiki::redirect(urlto(&#39;/&#39;, undef, 1));
  62. +
  63. + &gt; AFACIS, `baseurl` is only called in 3 places so I don&#39;t think that&#39;s
  64. + &gt; needed. --&#91;&#91;Joey&#93;&#93;
  65. </pre>
  66. </div>
  67. <!-- 178d6a16c2fff68edfbe6a1af5c8a9fa91db6039 -->