Don't retry feed retrieval on HTTP 304 (Not Modified)

(cherry picked from commit 10ef5b59fa16c9eedacf217550f408026bebbdc8)

3 files changed, 10 insertions, 1 deletions

diff --git a/rss/exception.h b/rss/exception.h
index 5b0548e2f..1fc1ef33 100644
--- a/rss/exception.h
+++ b/rss/exception.h
@@ -16,6 +16,9 @@ private:
 	std::string emsg;
 };
 
+class NotModifiedException : public std::exception {
+};
+
 } // namespace rsspp
 
 #endif /* NEWSBOAT_RSSPPEXCEPTION_H_ */
diff --git a/rss/parser.cpp b/rss/parser.cpp
index 68b3c2ab..2eb66d82 100644
--- a/rss/parser.cpp
+++ b/rss/parser.cpp
@@ -239,6 +239,9 @@ Feed Parser::parse_url(const std::string& url,
 		}
 		throw Exception(msg);
 	}
+	if (infoOk == CURLE_OK && status == 304) {
+		throw NotModifiedException();
+	}
 
 	LOG(Level::INFO,
 		"Parser::parse_url: retrieved data for %s: %s",
diff --git a/src/reloader.cpp b/src/reloader.cpp
index 3c11628d..9c5044a7 100644
--- a/src/reloader.cpp
+++ b/src/reloader.cpp
@@ -114,11 +114,14 @@ void Reloader::reload(unsigned int pos,
 					_("Error while retrieving %s: %s"),
 					utils::censor_url(oldfeed->rssurl()),
 					emsg);
-		} catch (rsspp::Exception& e) {
+		} catch (const rsspp::Exception& e) {
 			errmsg = strprintf::fmt(
 					_("Error while retrieving %s: %s"),
 					utils::censor_url(oldfeed->rssurl()),
 					e.what());
+		} catch (const rsspp::NotModifiedException&) {
+			// Nothing to be done, feed was not chaned since last retrieve
+			oldfeed->set_status(DlStatus::SUCCESS);
 		}
 		if (!errmsg.empty()) {
 			oldfeed->set_status(DlStatus::DL_ERROR);