Additiona work on the caching we really have to look into some serious http library...

diff --git a/lib/rbot/httputil.rb b/lib/rbot/httputil.rb
index 1a43c1850ec49e09e53f8e813ac149d7e23ebb80..92918f7745ccd2f7747e79d60a5fc09241ccd834 100644 (file)
--- a/lib/rbot/httputil.rb
+++ b/lib/rbot/httputil.rb
@@ -133,6 +133,7 @@ class HttpUtil
   # simple get request, returns (if possible) response body following redirs
   # and caching if requested
   # if a block is given, it yields the urls it gets redirected to
+  # TODO we really need something to implement proper caching
   def get(uri_or_str, readtimeout=10, opentimeout=5, max_redir=@bot.config["http.max_redir"], cache=false)
     if uri_or_str.class <= URI
       uri = uri_or_str
@@ -150,7 +151,7 @@ class HttpUtil
         resp = http.get(uri.request_uri(), @headers)
         case resp
         when Net::HTTPSuccess
-          if cache
+          if cache && !(resp.key?('cache-control') && resp['cache-control']=='must-revalidate')
             k = uri.to_s
             @cache[k] = Hash.new
             @cache[k][:body] = resp.body