Fixed issues where HTML comments inside style tag would hang Internet Explorer

Conflicts: CHANGELOG
11 years ago · bdc515d35c
parent 9919c2e68c
commit bdc515d35c
3 changed files with 6 additions and 5 deletions
--- a/1
+++ b/1
@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================

+- Fixed issues where HTML comments inside style tag would hang Internet Explorer
 - Fix setting domain in virtualmin password driver (#1489332)
 - Hide Delivery Status Notification option when smtp_server is unset (#1489336)
 - Display full attachment name using title attribute when name is too long to display (#1489320)
--- a/program/lib/Roundcube/rcube_utils.php
+++ b/program/lib/Roundcube/rcube_utils.php
@ -476,9 +476,9 @@ class rcube_utils

        // remove html comments and add #container to each tag selector.
        // also replace body definition because we also stripped off the <body> tag
-        $styles = preg_replace(
+        $source = preg_replace(
            array(
-                '/(^\s*<!--)|(-->\s*$)/',
+                '/(^\s*<\!--)|(-->\s*$)/m',
                '/(^\s*|,\s*|\}\s*)([a-z0-9\._#\*][a-z0-9\.\-_]*)/im',
                '/'.preg_quote($container_id, '/').'\s+body/i',
            ),
@ -490,9 +490,9 @@ class rcube_utils
            $source);

        // put block contents back in
-        $styles = $replacements->resolve($styles);
+        $source = $replacements->resolve($source);

-        return $styles;
+        return $source;
    }


--- a/program/lib/Roundcube/rcube_washtml.php
+++ b/program/lib/Roundcube/rcube_washtml.php
@ -429,7 +429,7 @@ class rcube_washtml
        }

        // fix (unknown/malformed) HTML tags before "wash"
-        $html = preg_replace_callback('/(<[\/]*)([^\s>]+)/', array($this, 'html_tag_callback'), $html);
+        $html = preg_replace_callback('/(<(?!\!)[\/]*)([^\s>]+)/', array($this, 'html_tag_callback'), $html);

        // Remove invalid HTML comments (#1487759)
        // Don't remove valid conditional comments