Merge remote branch 'smcv/ready/sslcookie-auto'

diff --combined IkiWiki/CGI.pm
index e0bfda9ae06d9685a4e4eaed5f8557963560c652,14193c33ae8a82fd2f69ad38ae176a33647cddfa..ede194ff9aee945dc0fb471bedaa47bf93eda829
--- 1/IkiWiki/CGI.pm
--- 2/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@@ -12,7 -12,7 +12,7 @@@ use Encode
  sub printheader ($) {
        my $session=shift;
        
-       if ($config{sslcookie}) {
+       if ($ENV{HTTPS} || $config{sslcookie}) {
                print $session->header(-charset => 'utf-8',
                        -cookie => $session->cookie(-httponly => 1, -secure => 1));
        }
@@@ -116,7 -116,7 +116,7 @@@ sub cgi_signin ($$;$) 
                required => 'NONE',
                javascript => 0,
                params => $q,
 -              action => $config{cgiurl},
 +              action => cgiurl(),
                header => 0,
                template => {type => 'div'},
                stylesheet => 1,
@@@ -198,7 -198,7 +198,7 @@@ sub cgi_prefs ($$) 
                required => 'NONE',
                javascript => 0,
                params => $q,
 -              action => $config{cgiurl},
 +              action => cgiurl(),
                template => {type => 'div'},
                stylesheet => 1,
                fieldsets => [
@@@ -231,11 -231,11 +231,11 @@@
        
        if ($form->submitted eq 'Logout') {
                $session->delete();
 -              redirect($q, $config{url});
 +              redirect($q, baseurl(undef));
                return;
        }
        elsif ($form->submitted eq 'Cancel') {
 -              redirect($q, $config{url});
 +              redirect($q, baseurl(undef));
                return;
        }
        elsif ($form->submitted eq 'Save Preferences' && $form->validate) {