[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-07-14 19:38:50
Message-ID: 20100714193850.C6E0BAC736 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1149994 by adawit:
Do not emit mimetype twice when retreiving content from cache.
M +12 -12 http.cpp
--- trunk/KDE/kdelibs/kioslave/http/http.cpp #1149993:1149994
@@ -2566,14 +2566,14 @@
// this header comes from the cache, so the response must have been cacheable :)
setCacheabilityMetadata(true);
- kDebug() << "emitting mimeType" << m_mimeType;
+ kDebug(7113) << "Emitting mimeType" << m_mimeType;
mimeType(m_mimeType);
forwardHttpResponseHeader();
}
void HTTPProtocol::fixupResponseMimetype()
{
- kDebug() << "before fixup" << m_mimeType;
+ kDebug(7113) << "before fixup" << m_mimeType;
// Convert some common mimetypes to standard mimetypes
if (m_mimeType == QLatin1String("application/x-targz"))
m_mimeType = QString::fromLatin1("application/x-compressed-tar");
@@ -2613,7 +2613,7 @@
else if (ext == QLatin1String(".WMV"))
m_mimeType = QString::fromLatin1("video/x-ms-wmv");
}
- kDebug() << "after fixup" << m_mimeType;
+ kDebug(7113) << "after fixup" << m_mimeType;
}
@@ -3464,15 +3464,6 @@
}
- // 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.cacheTag.ioMode == ReadFromCache) {
if (m_request.cacheTag.policy == CC_Verify &&
m_request.cacheTag.plan(m_maxCacheAge) != CacheTag::UseCached) {
@@ -3483,6 +3474,15 @@
return true;
}
+ // 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
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic