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

List:       kde-commits
Subject:    KDE/kdelibs/kioslave/http
From:       Thiago Macieira <thiago () kde ! org>
Date:       2005-12-30 2:07:18
Message-ID: 1135908438.980751.25085.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 492491 by thiago:

Forward port of:
------------------------------------------------------------------------
r492490 | thiago | 2005-12-30 00:00:47 -0200 (Fri, 30 Dec 2005) | 4 lines

Only send the Proxy-Connection: header if we're talking to a proxy.

BUG:119210



 M  +5 -3      http.cc  


--- trunk/KDE/kdelibs/kioslave/http/http.cc #492490:492491
@@ -2315,9 +2315,6 @@
     else
       header += "Connection: close\r\n";
 
-    if ( m_bPersistentProxyConnection )
-      header += "Proxy-Connection: Keep-Alive\r\n";
-
     if (!m_request.userAgent.isEmpty())
     {
         header += "User-Agent: ";
@@ -2476,7 +2473,12 @@
 
     // Do we need to authorize to the proxy server ?
     if ( m_state.doProxy && !m_bIsTunneled )
+    {
+      if ( m_bPersistentProxyConnection )
+	header += "Proxy-Connection: Keep-Alive\r\n";
+
       header += proxyAuthenticationHeader();
+    }
 
     if ( m_protocol == "webdav" || m_protocol == "webdavs" )
     {
[prev in list] [next in list] [prev in thread] [next in thread]