From: jocuri%softhome.net <>
Date: Thu, 21 Oct 2004 03:58:45 +0000 (+0000)
Subject: Patch for bug 232155: Remove uninitialized value warning from Pperl's Cookie.pm and... 
X-Git-Tag: bugzilla-2.19.1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f99b43776ab0b59707b809202b199b185ee770c3;p=thirdparty%2Fbugzilla.git

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.
---

diff --git a/Bugzilla/Auth/Login/WWW/CGI.pm b/Bugzilla/Auth/Login/WWW/CGI.pm
index 6b1761959d..a66ce7425b 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");
 }