Feedfetcher/HTTPClient fix

This fixes a typo which made the new Feedparser not use our own HTTPClient.
It also enhances the get() method of HTTPClient to optionally cope better
with bad HTTP responses:

Some servers return a body with a "304 Not Modified" status which violates
RFC 2616 but is usually accepted by common browsers. Setting the $sloppy304
parameter will return the response body. This fixes problems with feeds
from feedblendr.com

darcs-hash:20060429155805-7ad00-33a1c3142f241bf7747e8f679237cb6e8f1564ef.gz

2 files changed, 8 insertions, 3 deletions

diff --git a/inc/FeedParser.php b/inc/FeedParser.php
index f2aeb4e7b..7c0071af0 100644
--- a/inc/FeedParser.php
+++ b/inc/FeedParser.php
@@ -25,9 +25,11 @@ class FeedParser extends SimplePie {
 
     /**
      * Fetch an URL using our own HTTPClient
+     *
+     * Overrides SimplePie's own method
      */
-    function getFile($url){
+    function get_file($url){
         $http = new DokuHTTPClient();
-        return $http->get($url);
+        return $http->get($url,true);
     }
 }
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 18f4435bc..69a384487 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -111,10 +111,13 @@ class HTTPClient {
      *
      * Returns the wanted page or false on an error;
      *
+     * @param  string $url       The URL to fetch
+     * @param  bool   $sloppy304 Return body on 304 not modified
      * @author Andreas Gohr <andi@splitbrain.org>
      */
-    function get($url){
+    function get($url,$sloppy304=false){
         if(!$this->sendRequest($url)) return false;
+        if($this->status == 304 && $sloppy304) return $this->resp_body;
         if($this->status != 200) return false;
         return $this->resp_body;
     }