Merge pull request #51986 from zzak/7-1-fcec475438

carlosantoniodasilva · web-flow · commit 612701b6f9cc · 2024-06-07T11:54:42.000-03:00
Backport: Link should be separated by comma.
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
@@ -234,7 +234,7 @@ def headers
     #
     # The +send_early_hints+ method accepts a hash of links as follows:
     #
-    #   send_early_hints("link" => "</style.css>; rel=preload; as=style\n</script.js>; rel=preload")
+    #   send_early_hints("link" => "</style.css>; rel=preload; as=style,</script.js>; rel=preload")
     #
     # If you are using +javascript_include_tag+ or +stylesheet_link_tag+ the
     # Early Hints headers are included by default if supported.
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
@@ -1408,8 +1408,8 @@ def setup
   end
 
   test "when early hints is set in the env link headers are sent" do
-    early_hints = @request.send_early_hints("link" => "</style.css>; rel=preload; as=style\n</script.js>; rel=preload")
-    expected_hints = { "link" => "</style.css>; rel=preload; as=style\n</script.js>; rel=preload" }
+    early_hints = @request.send_early_hints("link" => "</style.css>; rel=preload; as=style,</script.js>; rel=preload")
+    expected_hints = { "link" => "</style.css>; rel=preload; as=style,</script.js>; rel=preload" }
 
     assert_equal expected_hints, early_hints
   end
diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -645,7 +645,7 @@ def send_preload_links_header(preload_links, max_header_size: MAX_HEADER_SIZE)
           return if response_present && response.sending?
 
           if respond_to?(:request) && request
-            request.send_early_hints("link" => preload_links.join("\n"))
+            request.send_early_hints("link" => preload_links.join(","))
           end
 
           if response_present

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ def headers`
`234`	`234`	`#`
`235`	`235`	`# The +send_early_hints+ method accepts a hash of links as follows:`
`236`	`236`	`#`
`237`		`- # send_early_hints("link" => "</style.css>; rel=preload; as=style\n</script.js>; rel=preload")`
	`237`	`+ # send_early_hints("link" => "</style.css>; rel=preload; as=style,</script.js>; rel=preload")`
`238`	`238`	`#`
`239`	`239`	`# If you are using +javascript_include_tag+ or +stylesheet_link_tag+ the`
`240`	`240`	`# Early Hints headers are included by default if supported.`