revert cgiurl change that broke openid login

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 0220a3cf67e7e78adf83c52ca4dbe09a312fa3cd..0cb8d6289bf958bd030b074a2984e0584dc52b8b 100644 (file)
--- 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 f7938b0615cc68174c393c0c07e3a4fc774f67f4..ba525989505cd4214faf85fa05c75fc7c9c603e7 100644 (file)
--- 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]]