summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjocuri%softhome.net <>2004-10-21 05:58:45 +0200
committerjocuri%softhome.net <>2004-10-21 05:58:45 +0200
commitf99b43776ab0b59707b809202b199b185ee770c3 (patch)
tree4b2e3e99501589ce793f3219799f143297749ede
parentad211c0a3da1b9b2d0739aee0545875138d6484f (diff)
downloadbugzilla-f99b43776ab0b59707b809202b199b185ee770c3.tar.gz
bugzilla-f99b43776ab0b59707b809202b199b185ee770c3.tar.xz
Patch for bug 232155: Remove uninitialized value warning from Pperl's Cookie.pm and unify code by removing redundancy; patch by Christian Reis <kiko@async.com.br> backported to 2.18 by Rob Siklos <rsiklos@adexa.com>; r=vladd,kiko, a=justdave.
-rw-r--r--Bugzilla/Auth/Login/WWW/CGI.pm11
1 files changed, 3 insertions, 8 deletions
diff --git a/Bugzilla/Auth/Login/WWW/CGI.pm b/Bugzilla/Auth/Login/WWW/CGI.pm
index 6b1761959..a66ce7425 100644
--- a/Bugzilla/Auth/Login/WWW/CGI.pm
+++ b/Bugzilla/Auth/Login/WWW/CGI.pm
@@ -92,7 +92,6 @@ sub login {
-value => $userid);
$cgi->send_cookie(-name => 'Bugzilla_logincookie',
-value => $logincookie);
-
}
}
elsif ($authres == AUTH_NODATA) {
@@ -170,13 +169,7 @@ sub login {
# The account may be disabled
if ($authres == AUTH_DISABLED) {
- # Clear the cookie
-
- $cgi->send_cookie(-name => 'Bugzilla_login',
- -expires => "Tue, 15-Sep-1998 21:49:00 GMT");
- $cgi->send_cookie(-name => 'Bugzilla_logincookie',
- -expires => "Tue, 15-Sep-1998 21:49:00 GMT");
-
+ clear_browser_cookies();
# and throw a user error
ThrowUserError("account_disabled",
{'disabled_reason' => $extra});
@@ -233,8 +226,10 @@ sub logout {
sub clear_browser_cookies {
my $cgi = Bugzilla->cgi;
$cgi->send_cookie(-name => "Bugzilla_login",
+ -value => "",
-expires => "Tue, 15-Sep-1998 21:49:00 GMT");
$cgi->send_cookie(-name => "Bugzilla_logincookie",
+ -value => "",
-expires => "Tue, 15-Sep-1998 21:49:00 GMT");
}