From dd433fd49443923f62c2f06240ec2dd63c732e14 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Wed, 22 Jan 2020 12:29:57 -0500
Subject: [PATCH 1/2] Fix favicon finding endless loop

---
 lib/PicoFeed/Reader/Favicon.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/PicoFeed/Reader/Favicon.php b/lib/PicoFeed/Reader/Favicon.php
index a4690ef..64cf1f7 100644
--- a/lib/PicoFeed/Reader/Favicon.php
+++ b/lib/PicoFeed/Reader/Favicon.php
@@ -3,7 +3,7 @@
 namespace PicoFeed\Reader;
 
 use DOMXPath;
-use GuzzleHttp\Exception\BadResponseException;
+use GuzzleHttp\Exception\RequestException;
 use PicoFeed\Base;
 use PicoFeed\Client\Client;
 use PicoFeed\Client\ClientException;
@@ -159,8 +159,8 @@ public function find($website_link, $favicon_link = '')
                 } elseif ($favicon_link !== '') {
                     return $this->find($website_link);
                 }
-            } catch (\Exception $e) {
-                return $this->find($website_link);
+            } catch (RequestException $e) {
+                continue;
             }
         }
 

From d7fb537f02080212f313570222e8ad92acaac765 Mon Sep 17 00:00:00 2001
From: "J. King" <jking@jkingweb.ca>
Date: Wed, 22 Jan 2020 12:41:25 -0500
Subject: [PATCH 2/2] Fix favicon finding properly

Now falls back to website-level finding in a more sensible way
---
 lib/PicoFeed/Reader/Favicon.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/PicoFeed/Reader/Favicon.php b/lib/PicoFeed/Reader/Favicon.php
index 64cf1f7..7420fba 100644
--- a/lib/PicoFeed/Reader/Favicon.php
+++ b/lib/PicoFeed/Reader/Favicon.php
@@ -156,15 +156,17 @@ public function find($website_link, $favicon_link = '')
 
                 if ($this->content !== '') {
                     return $icon_link;
-                } elseif ($favicon_link !== '') {
-                    return $this->find($website_link);
                 }
             } catch (RequestException $e) {
                 continue;
             }
         }
 
-        return '';
+        if ($favicon_link !== '') {
+            return $this->find($website_link);
+        } else {
+            return '';
+        }
     }
 
     /**