Explorar el Código

Fix duplicate HTTP header for POST (#7556)

Using POST with JSON would add `Content-Type: application/json` again and again everytime the feed's settings were saved
Alexandre Alapetite hace 11 meses
padre
commit
b2f80ad00a

+ 1 - 0
app/Controllers/feedController.php

@@ -215,6 +215,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController {
 			$headers = array_filter(array_map('trim', $headers));
 			if (!empty($headers)) {
 				$opts[CURLOPT_HTTPHEADER] = array_merge($headers, $opts[CURLOPT_HTTPHEADER] ?? []);
+				$opts[CURLOPT_HTTPHEADER] = array_unique($opts[CURLOPT_HTTPHEADER]);
 			}
 
 			$attributes = [

+ 1 - 0
app/Controllers/subscriptionController.php

@@ -197,6 +197,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController {
 			$headers = array_filter(array_map('trim', $headers));
 			if (!empty($headers)) {
 				$opts[CURLOPT_HTTPHEADER] = array_merge($headers, $opts[CURLOPT_HTTPHEADER] ?? []);
+				$opts[CURLOPT_HTTPHEADER] = array_unique($opts[CURLOPT_HTTPHEADER]);
 			}
 
 			$feed->_attribute('curl_params', empty($opts) ? null : $opts);