Merge pull request #1286 from rich-coe/bug.1285

Check for 304 status before 0 length data #1285
lwindolf · Aug 14, 2023 · 39cf0f8 · 39cf0f8
2 parents 012d2a2 + 409c27c
commit 39cf0f8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/subscription.c b/src/subscription.c
@@ -189,7 +189,10 @@ subscription_process_update_result (const struct updateResult * const result, gp
   }
 
 	/* consider everything that prevents processing the data we got */
-	if (result->httpstatus >= 400 || !result->data) {
+	if (304 == result->httpstatus) {
+		node->available = TRUE;
+		statusbar = g_strdup_printf (_("\"%s\" has not changed since last update"), node_get_title(node));
+	} else if (result->httpstatus >= 400 || !result->data) {
 		/* Default */
 		subscription->error = FETCH_ERROR_NET;
 		node->available = FALSE;
@@ -203,9 +206,6 @@ subscription_process_update_result (const struct updateResult * const result, gp
 			subscription_set_discontinued (subscription, TRUE);
 			statusbar = g_strdup_printf (_("\"%s\" is discontinued. Liferea won't updated it anymore!"), node_get_title (node));
 		}
-	} else if (304 == result->httpstatus) {
-		node->available = TRUE;
-		statusbar = g_strdup_printf (_("\"%s\" has not changed since last update"), node_get_title(node));
 	} else if (result->filterErrors) {
 		node->available = FALSE;
 		subscription->error = FETCH_ERROR_NET;