From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 9 Jan 2013 16:35:01 +0000 (+0000)
Subject: wip fixes
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=commitdiff_plain;h=28e1003c17b355747668d790ee7f66d3f0885ea7

wip fixes
---

diff --git a/cgi-auth-hybrid.pm b/cgi-auth-hybrid.pm
index d945fae..fff16b7 100644
--- a/cgi-auth-hybrid.pm
+++ b/cgi-auth-hybrid.pm
@@ -183,6 +183,7 @@ sub new_verifier {
 	    gen_login_form => \&gen_plain_login_form,
 	    gen_login_link => \&gen_plain_login_link,
 	    gettext => sub { gettext($_[2]); },
+	    print => sub { print $_[2] or die $!; },
 	},
 	Dbh => undef,
     };
@@ -663,7 +664,8 @@ sub check_ok ($) {
 	die $kind;
     }
 
-    $r->_print($r->_ch('gen_start_html',$title),
+    $r->_print($r->{Cgi}->header('text/html'),
+	       $r->_ch('gen_start_html',$title),
 	       @body,
 	       $r->_ch('gen_end_html'));
     return 0;
diff --git a/test.cgi b/test.cgi
index 6cb320e..59b7976 100755
--- a/test.cgi
+++ b/test.cgi
@@ -19,7 +19,7 @@ my $q = CGI->new;
 
 my $authreq = $verifier->new_request($q);
 
-$authreq->check_ok() or return;
+$authreq->check_ok() or exit;
 
 my $cookie = $authreq->secret_cookie();
 my $url = $q->url();