[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kioslave/http
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2010-05-15 20:39:56
Message-ID: 20100515203956.492B5AC8B5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1127199 by adawit:

Only fill out the necessary variables of KIO::AuthInfo when calling
checkCachedAuthInfo.


 M  +3 -5      http.cpp  


--- trunk/KDE/kdelibs/kioslave/http/http.cpp #1127198:1127199
@@ -3293,13 +3293,10 @@
                         m_request.url.setPass(QString());
                     } else {
                         // try to get credentials from kpasswdserver's cache, then try asking the user.
-                        authinfo.keepPassword = true;
                         authinfo.verifyPath = false; // we have realm, no path based checking please!
                         authinfo.realmValue = (*auth)->realm();
                         if (authinfo.realmValue.isEmpty() && !(*auth)->supportsPathMatching())
                             authinfo.realmValue = QLatin1String((*auth)->scheme());
-                        authinfo.comment = i18n("<b>%1</b> at <b>%2</b>",
-                                                authinfo.realmValue, authinfo.url.host());
 
                         // Save the current authinfo url because it can be modified by the call to
                         // checkCachedAuthentication. That way we can restore it if the call
@@ -3316,10 +3313,11 @@
                                     errorMsg = i18n("Proxy Authentication Failed.");
                             }
 
-                            // Reset parameters that might be modified by the
-                            // call to checkCachedAuthentication above...
+                            // Reset url to the saved url...
                             authinfo.url = reqUrl;
                             authinfo.keepPassword = true;
+                            authinfo.comment = i18n("<b>%1</b> at <b>%2</b>",
+                                                    authinfo.realmValue, authinfo.url.host());
 
                             if (!openPasswordDialog(authinfo, errorMsg)) {
                                 if (sendErrorPageNotification()) {
[prev in list] [next in list] [prev in thread] [next in thread]