diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php
index 7271519e515d7930877600b8f02ebb4e1405b24d..53bb22e1981bdaa39e690d728465790c24e70391 100644
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -279,6 +279,11 @@ public static function load($html) {
<body>!html</body>
</html>
EOD;
+
+ // PHP's \DOMDocument::saveXML() encodes carriage returns as so
+ // normalize all newlines to line feeds.
+ $html = str_replace(["\r\n", "\r"], "\n", $html);
+
// PHP's \DOMDocument serialization adds extra whitespace when the markup
// of the wrapping document contains newlines, so ensure we remove all
// newlines before injecting the actual HTML body to be processed.
diff --git a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
index a333cdab53e591e12e0fb0d8209e721bae656c7e..e486961360017aef0ea22d84d6597702eadfa8a6 100644
--- a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
@@ -390,6 +390,11 @@ public function providerTestTransformRootRelativeUrlsToAbsolute() {
}
}
+ // Double-character carriage return should be normalized.
+ $data['line break with double special character'] = ["Test without links but with\r\nsome special characters", 'http://example.com', "Test without links but with\nsome special characters"];
+ $data['line break with single special character'] = ["Test without links but with \nsome special characters", 'http://example.com', FALSE];
+ $data['carriage return within html'] = ["<a\rhref='/node'>My link</a>", 'http://example.com', '<a href="http://example.com/node">My link</a>'];
+
return $data;
}