diff --git a/README.rst b/README.rst index bdc12433..72f71ad6 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -PyWb 0.10.6 +PyWb 0.10.7 =========== .. image:: https://travis-ci.org/ikreymer/pywb.svg?branch=master diff --git a/pywb/__init__.py b/pywb/__init__.py index d04a05c1..2542afed 100644 --- a/pywb/__init__.py +++ b/pywb/__init__.py @@ -1,4 +1,4 @@ -__version__ = '0.10.6' +__version__ = '0.10.7-dev' DEFAULT_CONFIG = 'pywb/default_config.yaml' diff --git a/pywb/rewrite/test/test_rewrite_live.py b/pywb/rewrite/test/test_rewrite_live.py index dcd76e82..188a4b73 100644 --- a/pywb/rewrite/test/test_rewrite_live.py +++ b/pywb/rewrite/test/test_rewrite_live.py @@ -194,7 +194,9 @@ def test_local_unclosed_script(): assert '' in buff, buff # JS location and JS link rewritten - assert 'window.WB_wombat_location = "/pywb/20131226101010/http:\/\/example.com/dynamic_page.html";\n}\n' in buff, buff + assert 'window.WB_wombat_location = "/pywb/20131226101010/http:\/\/example.com/dynamic_page.html";' in buff, buff + + assert '' in buff, buff def test_example_1(): diff --git a/pywb/static/wombat.js b/pywb/static/wombat.js index 416aad24..51fcd1a5 100644 --- a/pywb/static/wombat.js +++ b/pywb/static/wombat.js @@ -1683,6 +1683,12 @@ var wombat_internal = function($wbwindow) { var orig_get_cookie = get_orig_getter($wbwindow.document, "cookie"); var orig_set_cookie = get_orig_setter($wbwindow.document, "cookie"); + if (!orig_get_cookie) { + orig_get_cookie = get_orig_getter($wbwindow.Document.prototype, "cookie"); + } + if (!orig_set_cookie) { + orig_set_cookie = get_orig_setter($wbwindow.Document.prototype, "cookie"); + } function rewrite_cookie(cookie) { var matched = cookie.match(cookie_path_regex); @@ -1839,8 +1845,8 @@ var wombat_internal = function($wbwindow) { var orig_referrer = extract_orig($wbwindow.document.referrer); - - def_prop($wbwindow.document, "domain", undefined, function() { return wbinfo.wombat_host }); + // changing domain disallowed, but set as no-op to avoid errors + def_prop($wbwindow.document, "domain", function() {}, function() { return wbinfo.wombat_host }); def_prop($wbwindow.document, "referrer", undefined, function() { return orig_referrer; });