diff options
| author | Joey Hess <joey@kitenet.net> | 2010-12-25 14:23:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-12-25 14:23:55 -0400 |
| commit | 93d7368a326b418a32f9ef686450da304186f330 (patch) | |
| tree | 363197b745a36e3a6f255f55f330f299ddda84c1 | |
| parent | beae7ef9db01ab2af75d3176b016113c9d33f0a9 (diff) | |
| download | ikiwiki-93d7368a326b418a32f9ef686450da304186f330.tar ikiwiki-93d7368a326b418a32f9ef686450da304186f330.tar.gz | |
revert cgiurl change that broke openid login
| -rw-r--r-- | IkiWiki/Plugin/openid.pm | 4 | ||||
| -rw-r--r-- | doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 0220a3cf6..0cb8d6289 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -148,7 +148,7 @@ sub validate ($$$;$) { } my $cgiurl=$config{openid_cgiurl}; - $cgiurl=IkiWiki::cgiurl() if ! defined $cgiurl; + $cgiurl=$config{cgiurl} if ! defined $cgiurl; my $trust_root=$config{openid_realm}; $trust_root=$cgiurl if ! defined $trust_root; @@ -249,7 +249,7 @@ sub getobj ($$) { } my $cgiurl=$config{openid_cgiurl}; - $cgiurl=IkiWiki::cgiurl() if ! defined $cgiurl; + $cgiurl=$config{cgiurl} if ! defined $cgiurl; return Net::OpenID::Consumer->new( ua => $ua, 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 f7938b061..ba5259895 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 @@ -321,3 +321,11 @@ Potential future things: >> to the top of the wiki --[[smcv]] [[merged|done]] --[[Joey]] + +---- + +Update: I had to revert part of 296e5cb2fd3690e998b3824d54d317933c595873, +since it broke openid logins. The openid object requires a complete, +not a relative cgiurl. I'm not sure if my changing that back to using +`$config{cgiurl}` will force users back to eg, the non-https version of a +site when logging in via openid. smcv? --[[Joey]] |