From: http://smcv.pseudorandom.co.uk/ Date: Tue, 23 Nov 2010 23:50:29 +0000 (+0000) Subject: tested and seems to work X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/9180381728e252cf474eb8a4b0460755b5c28340?hp=172f41f6de288814fbd013f3465e658c562b10b1 tested and seems to work --- 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 8b0501041..264eb9688 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 @@ -147,7 +147,7 @@ you don't like my approach: ---- -[[!template id=gitbranch branch=smcv/localurl author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/ready/localurl author="[[smcv]]"]] [[!tag patch]] OK, here's an alternative approach, closer in spirit to what was initially @@ -171,10 +171,10 @@ support that. fully relative nor fully absolute, and there doesn't seem to be a good name for them... -I tested an earlier version on a demo website with the CGI enabled, and it seemed to +I've tested this on a demo website with the CGI enabled, and it seemed to work nicely (there might be bugs in some plugins, I didn't try all of them). -I haven't yet re-tested with my updated branch, which is why it's not `ready/` -yet. +The branch at [[todo/use secure cookies for SSL logins]] goes well with +this one. The `$config{url}` and `$config{cgiurl}` are both HTTP, but if I enable `httpauth`, set `cgiauthurl` to a HTTPS version of the same site and log