git.oblomov.eu Git - ikiwiki/blob - doc/recentchanges/change_d916cd2f71f1c22dad947d7b2134edbbb15e7b8e._change

   1 [[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
   2
   3 [[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
   4
   5 [[!meta title="""change to todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both on ikiwiki"""]]
   6
   7 [[!meta permalink="http://ikiwiki.info/recentchanges/#change-d916cd2f71f1c22dad947d7b2134edbbb15e7b8e"]]
   8
   9 <div id="change-d916cd2f71f1c22dad947d7b2134edbbb15e7b8e" class="metadata">
  10 <span class="desc"><br />Changed pages:</span>
  11 <span class="pagelinks">
  12
  13 <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&amp;do=goto" rel="nofollow">todo/want to avoid ikiwiki using http or https in urls to allow serving both</a>
  14
  15
  16 </span>
  17 <span class="desc"><br />Changed by:</span>
  18 <span class="committer">
  19
  20 <a href="http://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a>
  21
  22 </span>
  23 <span class="desc"><br />Commit type:</span>
  24 <span class="committype">web</span>
  25 <span class="desc"><br />Date:</span>
  26 <span class="changedate"><span class="relativedate" title="Mon, 22 Nov 2010 19:45:02 +0000">19:45:02 11/22/10</span></span>
  27 <span class="desc"><br /></span>
  28 </div>
  29
  30 <span class="revert">
  31 <a href="http://ikiwiki.info/ikiwiki.cgi?rev=d916cd2f71f1c22dad947d7b2134edbbb15e7b8e&amp;do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a>
  32 </span>
  33
  34 <div class="changelog">
  35
  36
  37 respond to feedback<br />
  38
  39
  40 </div>
  41
  42 <div class="diff">
  43 <pre>
  44 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
  45 index 4fafc2b..80925b4 100644
  46 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
  47 +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
  48 @@ -191,14 +191,41 @@ New API added by this branch:
  49    &gt; The new form for local urls will typically be only a little bit longer,
  50    &gt; except in the unusual case where the cgiurl is elsewhere. --&#91;&#91;Joey&#93;&#93;
  51
  52 +  &gt;&gt; So, have urlto(x, y) use `$local_url`? There are few calls, but IMO
  53 +  &gt;&gt; they&#39;re for the most important things - wikilinks, img, map and
  54 +  &gt;&gt; other ordinary hyperlinks. Using `$local_url` would be fine for
  55 +  &gt;&gt; webserver-based use, but it does stop you browsing your wiki&#39;s
  56 +  &gt;&gt; HTML over `file:///` (unless you set that as the base URL, but
  57 +  &gt;&gt; then you can&#39;t move it around), and stops you moving simple
  58 +  &gt;&gt; outputs (like the docwiki!) around.
  59 +  &gt;&gt;
  60 +  &gt;&gt; I personally think breaking the docwiki is enough to block that.
  61 +  &gt;&gt;
  62 +  &gt;&gt; How about this?
  63 +  &gt;&gt;
  64 +  &gt;&gt; * `urlto($link, $page)` with `$page` defined: relative
  65 +  &gt;&gt; * `urlto($link, undef)`: local, starts with `/`
  66 +  &gt;&gt; * `urlto($link)`: also local, as a side-effect
  67 +  &gt;&gt; * `urlto($link, $anything, 1)` (but idiomatically, `$anything` is
  68 +  &gt;&gt;   normally undef): absolute, starts with `http&#91;s&#93;://`
  69 +  &gt;&gt;
  70 +  &gt;&gt; --&#91;&#91;smcv&#93;&#93;
  71 +
  72  * `IkiWiki::baseurl` has a new second argument which works like the
  73    third argument of `urlto`
  74
  75 +  &gt; I assume you have no objection to this --&#91;&#91;smcv&#93;&#93;
  76 +
  77  * `IkiWiki::cgiurl` uses `$local_cgiurl` if passed `local_cgiurl =&gt; 1`
  78
  79 +  &gt; Possibly changed to making this always be local unless `cgiurl =&gt; $x`
  80 +  &gt; is given: see below --&#91;&#91;smcv&#93;&#93;
  81 +
  82  * `IkiWiki::cgiurl` omits the trailing `?` if given no named parameters
  83    except `cgiurl` and/or `local_cgiurl`
  84
  85 +  &gt; I assume you have no objection to this --&#91;&#91;smcv&#93;&#93;
  86 +
  87  Bugs:
  88
  89  * I don&#39;t think anything except `openid` calls `cgiurl` without also
  90 @@ -211,10 +238,18 @@ Bugs:
  91
  92    &gt; I agree that makes sense. --&#91;&#91;Joey&#93;&#93;
  93
  94 +  &gt;&gt; I&#39;m not completely sure whether you&#39;re agreeing with &quot;perhaps do this&quot;
  95 +  &gt;&gt; or &quot;that looks too strange&quot;, so please disambiguate:
  96 +  &gt;&gt; would you accept a patch that makes `cgiurl` default to a local
  97 +  &gt;&gt; (starts-with-`/`) result? If you would, that&#39;d reduce the diff. --&#91;&#91;smcv&#93;&#93;
  98 +
  99  * It occurs to me that `IkiWiki::cgiurl` could probably benefit from being
 100    exported? Perhaps also `IkiWiki::baseurl`?
 101
 102 -  &gt; Possibly, see &#91;&#91;firm_up_plugin_interface&#93;&#93;. --&#91;&#91;Joey&#93;&#93;
 103 +  &gt; Possibly, see &#91;&#91;firm_up_plugin_interface&#93;&#93;. --&#91;&#91;Joey&#93;&#93;
 104 +
 105 +  &gt;&gt; Not really part of this branch, though, so wontfix (unless you ask me
 106 +  &gt;&gt; to do so). --&#91;&#91;smcv&#93;&#93;
 107
 108  * Or, to reduce use of the unexported `baseurl` function, it might make
 109    sense to give `urlto` a special case that references the root of the wiki,
 110 @@ -227,3 +262,5 @@ Bugs:
 111
 112    &gt; AFACIS, `baseurl` is only called in 3 places so I don&#39;t think that&#39;s
 113    &gt; needed. --&#91;&#91;Joey&#93;&#93;
 114 +
 115 +  &gt;&gt; OK, wontfix. --&#91;&#91;smcv&#93;&#93;
 116
 117 </pre>
 118 </div>
 119
 120 <!-- d916cd2f71f1c22dad947d7b2134edbbb15e7b8e -->