[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:       2011-01-23 8:17:06
Message-ID: 20110123081706.B0792AC8B9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1216412 by adawit:

Don't cache files that are bigger than the maximum cache size. 

NOTE: this fix only works for cases where the content size is known and
as such further improvements are needed in the future. Until then this 
should fix all the problems reported in BR 244215.

CCBUG: 244215


 M  +14 -3     http.cpp  


--- trunk/KDE/kdelibs/kioslave/http/http.cpp #1216411:1216412
@@ -334,7 +334,7 @@
     , m_iSize(NO_SIZE)
     , m_isBusy(false)
     , m_maxCacheAge(DEFAULT_MAX_CACHE_AGE)
-    , m_maxCacheSize(DEFAULT_MAX_CACHE_SIZE/2)
+    , m_maxCacheSize(DEFAULT_MAX_CACHE_SIZE)
     , m_protocol(protocol)
     , m_wwwAuth(0)
     , m_proxyAuth(0)
@@ -3756,7 +3756,7 @@
         if (!cacheFileOpenWrite()) {
             kDebug(7113) << "Error creating cache entry for " << m_request.url.url()<<"!\n";
         }
-        m_maxCacheSize = config()->readEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
+        m_maxCacheSize = config()->readEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE);
     } else if (m_request.responseCode == 304 && m_request.cacheTag.file) {
         if (!mayCache) {
             kDebug(7113) << "This webserver is confused about the cacheability of the data it sends.";
@@ -4928,13 +4928,24 @@
     if (!m_request.cacheTag.file) {
         return;
     }
+
+    // If the file being downloaded is so big that it exceeds the max cache size,
+    // do not cache it! See BR# 244215. NOTE: this can be improved upon in the
+    // future...
+    if (m_iSize >= (m_maxCacheSize * 1024)) {
+        kDebug(7113) << "Caching diabled because content size is too big.";
+        cacheFileClose();
+        return;
+    }
+
     Q_ASSERT(m_request.cacheTag.ioMode == WriteToCache);
     Q_ASSERT(m_request.cacheTag.file->openMode() & QIODevice::WriteOnly);
+
     if (d.isEmpty()) {
         cacheFileClose();
     }
 
-    //### abort if file grows too big! (early abort if we know the size, implement!)
+    //TODO: abort if file grows too big!
 
     // write the variable length text header as soon as we start writing to the file
     if (!m_request.cacheTag.bytesCached) {
[prev in list] [next in list] [prev in thread] [next in thread]