diff --git a/pywb/rewrite/regex_rewriters.py b/pywb/rewrite/regex_rewriters.py index 6c7c5ff6..9769e1bf 100644 --- a/pywb/rewrite/regex_rewriters.py +++ b/pywb/rewrite/regex_rewriters.py @@ -113,7 +113,7 @@ class JSLinkRewriterMixin(object): """ #JS_HTTPX = r'(?:(?:(?<=["\';])https?:)|(?<=["\']))\\{0,4}/\\{0,4}/[A-Za-z0-9:_@.-]+.*(?=["\s\';&\\])' #JS_HTTPX = r'(?<=["\';])(?:https?:)?\\{0,4}/\\{0,4}/[A-Za-z0-9:_@.\-/\\?&#]+(?=["\';&\\])' - JS_HTTPX = r'(?<=["\';])(?:https?:)?\\{0,4}/\\{0,4}/[A-Za-z0-9:_@.-][^"\s\';&\\]*(?=["\';&\\])' + JS_HTTPX = r'(?:(?<=["\';])https?:|(?<=["\']))\\{0,4}/\\{0,4}/[A-Za-z0-9:_@.-][^"\s\';&\\]*(?=["\';&\\])' def __init__(self, rewriter, rules=[]): rules = rules + [ diff --git a/pywb/rewrite/test/test_regex_rewriters.py b/pywb/rewrite/test/test_regex_rewriters.py index d08406b5..14291600 100644 --- a/pywb/rewrite/test/test_regex_rewriters.py +++ b/pywb/rewrite/test/test_regex_rewriters.py @@ -92,6 +92,9 @@ r""" >>> _test_js('cool_Location = "//example.com/abc.html" //comment') 'cool_Location = "/web/20131010/http://example.com/abc.html" //comment' +>>> _test_js('A = B;//C + D;') +'A = B;//C + D;' + # document.cookie test >>> _test_js('document.cookie = "a=b; Path=/"') 'document.WB_wombat_cookie = "a=b; Path=/"' @@ -103,6 +106,8 @@ r""" >>> _test_js('"http:\/\/sub-site.example.com\/path-dashes\/path_other\/foo_bar.txt"') '"/web/20131010/http:\\/\\/sub-site.example.com\\/path-dashes\\/path_other\\/foo_bar.txt"' +>>> _test_js('"a=b&http:\/\/example.com/;c=d"') +'"a=b&/web/20131010/http:\\/\\/example.com/;c=d"' #================================================================= # XML Rewriting