[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-12-20 17:50:27
Message-ID: 20101220175027.855B53E1F1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1208112 by adawit:

Set the "HTTP-Headers" meta data before emitting the mimeType signal.

 M  +9 -9      http.cpp  


--- trunk/KDE/kdelibs/kioslave/http/http.cpp #1208111:1208112
@@ -3488,15 +3488,6 @@
         return parseHeaderFromCache();
     }
 
-    // Let the app know about the mime-type iff this is not
-    // a redirection and the mime-type string is not empty.
-    if (!m_isRedirection &&
-        (!m_mimeType.isEmpty() || m_request.method == HTTP_HEAD) &&
-        (m_isLoadingErrorPage || !authRequiresAnotherRoundtrip)) {
-        kDebug(7113) << "Emitting mimetype " << m_mimeType;
-        mimeType( m_mimeType );
-    }
-
     if (config()->readEntry("PropagateHttpHeader", false) ||
         m_request.cacheTag.ioMode == WriteToCache) {
         // store header lines if they will be used; note that the tokenizer removing
@@ -3521,6 +3512,15 @@
     // to screw up some sites. See BR# 150904.
     forwardHttpResponseHeader();
 
+    // Let the app know about the mime-type iff this is not
+    // a redirection and the mime-type string is not empty.
+    if (!m_isRedirection &&
+        (!m_mimeType.isEmpty() || m_request.method == HTTP_HEAD) &&
+        (m_isLoadingErrorPage || !authRequiresAnotherRoundtrip)) {
+        kDebug(7113) << "Emitting mimetype " << m_mimeType;
+        mimeType( m_mimeType );
+    }    
+
     if (m_request.method == HTTP_HEAD) {
         return true;
     }
[prev in list] [next in list] [prev in thread] [next in thread]