summaryrefslogtreecommitdiff
path: root/doc/recentchanges/change_9180381728e252cf474eb8a4b0460755b5c28340._change
blob: 617d642b9a4229b8c7fe731045109e08857affc1 (plain)
  1. [[!meta author="""http://smcv.pseudorandom.co.uk/"""]]
  2. [[!meta authorurl="""http://smcv.pseudorandom.co.uk/"""]]
  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-9180381728e252cf474eb8a4b0460755b5c28340"]]
  5. <div id="change-9180381728e252cf474eb8a4b0460755b5c28340" 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=264eb968844d6f766794cc8f737f68299a052de8;hp=8b0501041379278330dbdb52c3232dc26fef5d2c;hb=9180381728e252cf474eb8a4b0460755b5c28340;hpb=172f41f6de288814fbd013f3465e658c562b10b1" 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://smcv.pseudorandom.co.uk/" rel="nofollow">smcv</a>
  13. </span>
  14. <span class="desc"><br />Commit type:</span>
  15. <span class="committype">web</span>
  16. <span class="desc"><br />Date:</span>
  17. <span class="changedate"><span class="relativedate" title="Tue, 23 Nov 2010 23:50:29 +0000">23:50:29 11/23/10</span></span>
  18. <span class="desc"><br /></span>
  19. </div>
  20. <span class="revert">
  21. <a href="http://ikiwiki.info/ikiwiki.cgi?rev=9180381728e252cf474eb8a4b0460755b5c28340&amp;do=revert" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a>
  22. </span>
  23. <div class="changelog">
  24. tested and seems to work<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 8b05010..264eb96 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. @@ -147,7 +147,7 @@ you don&#39;t like my approach:
  33. ----
  34. -&#91;&#91;!template id=gitbranch branch=smcv/localurl author=&quot;&#91;&#91;smcv&#93;&#93;&quot;&#93;&#93;
  35. +&#91;&#91;!template id=gitbranch branch=smcv/ready/localurl author=&quot;&#91;&#91;smcv&#93;&#93;&quot;&#93;&#93;
  36. &#91;&#91;!tag patch&#93;&#93;
  37. OK, here&#39;s an alternative approach, closer in spirit to what was initially
  38. @@ -171,10 +171,10 @@ support that.
  39. fully relative nor fully absolute, and there doesn&#39;t seem to be a good name
  40. for them...
  41. -I tested an earlier version on a demo website with the CGI enabled, and it seemed to
  42. +I&#39;ve tested this on a demo website with the CGI enabled, and it seemed to
  43. work nicely (there might be bugs in some plugins, I didn&#39;t try all of them).
  44. -I haven&#39;t yet re-tested with my updated branch, which is why it&#39;s not `ready/`
  45. -yet.
  46. +The branch at &#91;&#91;todo/use secure cookies for SSL logins&#93;&#93; goes well with
  47. +this one.
  48. The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable
  49. `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log
  50. </pre>
  51. </div>
  52. <!-- 9180381728e252cf474eb8a4b0460755b5c28340 -->