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

List:       kde-commits
Subject:    branches/KDE/4.3/kdelibs/kioslave/http
From:       Maks Orlovich <maksim () kde ! org>
Date:       2009-07-27 22:45:01
Message-ID: 1248734701.501611.31971.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1003273 by orlovich:

Revert 996832, r996842, r1000698. Even with the follow up, it causes a critical regression.
BUG: 201315


 M  +3 -11     http.cpp  
 M  +0 -1      http.h  


--- branches/KDE/4.3/kdelibs/kioslave/http/http.cpp #1003272:1003273
@@ -3381,12 +3381,10 @@
             }
         }
 
-        // read and trash body data until the next response header starts.
         if (m_request.isKeepAlive) {
+            // Important: trash data until the next response header starts.
             readBody(true);
         }
-        //### for now this is necessary, but we could really just close the connection right here.
-        m_dataInternal = true;
     }
 
   // We need to do a redirect
@@ -3528,13 +3526,12 @@
   }
 
   // Let the app know about the mime-type iff this is not
-  // a redirection (or a 401/407 auth required) and the mime-type string is not empty.
+  // a redirection and the mime-type string is not empty.
   if (locationStr.isEmpty() && (!m_mimeType.isEmpty() ||
-      m_request.method == HTTP_HEAD) && !m_dataInternal)
+      m_request.method == HTTP_HEAD))
   {
     kDebug(7113) << "Emitting mimetype " << m_mimeType;
     mimeType( m_mimeType );
-    m_mimeTypeSent = true;
   }
 
   if (config()->readEntry("PropagateHttpHeader", false) ||
@@ -4080,10 +4077,7 @@
           m_mimeType = QString::fromLatin1( DEFAULT_MIME_TYPE );
           kDebug(7113) << "Using default mimetype: " <<  m_mimeType;
         }
-      }
 
-      if (!m_mimeTypeSent && !m_mimeType.isEmpty() && !m_isRedirection)
-      {
         if ( m_request.cacheTag.writeToCache )
         {
           createCacheEntry( m_mimeType, m_request.cacheTag.expireDate );
@@ -4100,7 +4094,6 @@
         }
         mimeType(m_mimeType);
         m_mimeTypeBuffer.resize(0);
-        m_mimeTypeSent = true;
       }
 
       data( d );
@@ -4225,7 +4218,6 @@
 
   // Main incoming loop...  Gather everything while we can...
   m_cpMimeBuffer = false;
-  m_mimeTypeSent = false;
   m_mimeTypeBuffer.resize(0);
   struct timeval last_tv;
   gettimeofday( &last_tv, 0L );
--- branches/KDE/4.3/kdelibs/kioslave/http/http.h #1003272:1003273
@@ -486,7 +486,6 @@
 
   // Mimetype determination
   bool m_cpMimeBuffer;
-  bool m_mimeTypeSent;
   QByteArray m_mimeTypeBuffer;
 
 
[prev in list] [next in list] [prev in thread] [next in thread]