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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs=5D_kioslave/http=3A_Fix_the_issue_of_HTTPS_?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-03-05 5:45:06
Message-ID: 20110305054506.AE8C5A60CB () git ! kde ! org
[Download RAW message or body]

Git commit 8a2929b2dd8b7fe166053aed51a5def3c6565844 by Dawit Alemayehu.
Committed on 05/03/2011 at 01:00.
Pushed by adawit into branch 'master'.

Fix the issue of HTTPS over proxy not working properly when connecting to two or more secure sites.

BUG:155707
FIXED-IN:4.6.2

M  +1    -1    kioslave/http/http.cpp     

http://commits.kde.org/kdelibs/8a2929b2dd8b7fe166053aed51a5def3c6565844

diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
index db07af6..7e7a7d1 100644
--- a/kioslave/http/http.cpp
+++ b/kioslave/http/http.cpp
@@ -2111,7 +2111,7 @@ bool HTTPProtocol::httpShouldCloseConnection()
   // TODO compare current proxy state against proxy needs of next request,
   // *when* we actually have variable proxy settings!
 
-  if (isValidProxy(m_request.proxyUrl))  {
+  if (isHttpProxy(m_request.proxyUrl) && !isAutoSsl())  {
       return !isCompatibleNextUrl(m_server.proxyUrl, m_request.proxyUrl);
   }
   return !isCompatibleNextUrl(m_server.url, m_request.url);

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