diff --git a/README.rst b/README.rst index 2754658f..e74014c9 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -PyWb 0.11.1 +PyWb 0.11.2 =========== .. image:: https://travis-ci.org/ikreymer/pywb.svg?branch=master diff --git a/pywb/rewrite/html_rewriter.py b/pywb/rewrite/html_rewriter.py index 51eb2e99..7992b99f 100644 --- a/pywb/rewrite/html_rewriter.py +++ b/pywb/rewrite/html_rewriter.py @@ -297,6 +297,8 @@ class HTMLRewriterMixin(object): elif (tag == 'meta') and (attr_name == 'content'): if self.has_attr(tag_attrs, ('http-equiv', 'refresh')): attr_value = self._rewrite_meta_refresh(attr_value) + elif attr_value.startswith(self.DATA_RW_PROTOCOLS): + attr_value = self._rewrite_url(attr_value, rw_mod) # special case: param value, conditional rewrite elif (tag == 'param'): diff --git a/pywb/rewrite/rewrite_content.py b/pywb/rewrite/rewrite_content.py index d71ffd76..9ad1dc0e 100644 --- a/pywb/rewrite/rewrite_content.py +++ b/pywb/rewrite/rewrite_content.py @@ -244,8 +244,9 @@ class RewriteContent: if m: charset = m.group(1) charset = to_native_str(charset) - content_type = 'text/html; charset=' + charset - status_headers.replace_header('content-type', content_type) + # content_type = 'text/html; charset=' + charset + # status_headers.replace_header('content-type', content_type) + return charset @staticmethod diff --git a/pywb/rewrite/test/test_html_rewriter.py b/pywb/rewrite/test/test_html_rewriter.py index 7782a7c1..bfd39e0c 100644 --- a/pywb/rewrite/test/test_html_rewriter.py +++ b/pywb/rewrite/test/test_html_rewriter.py @@ -94,6 +94,12 @@ r""" >>> parse('') +>>> parse('') + + +>>> parse('') + + # Custom -data attribs >>> parse('
')
diff --git a/pywb/rewrite/test/test_rewrite_live.py b/pywb/rewrite/test/test_rewrite_live.py index e9da1c52..4fe5619d 100644 --- a/pywb/rewrite/test/test_rewrite_live.py +++ b/pywb/rewrite/test/test_rewrite_live.py @@ -209,7 +209,7 @@ def test_example_1(): # verify utf-8 charset detection - assert status_headers.get_header('content-type') == 'text/html; charset=utf-8' + assert status_headers.get_header('content-type') == 'text/html' assert '/pywb/20131226101010/http://www.iana.org/domains/example' in buff, buff diff --git a/pywb/static/wb.js b/pywb/static/wb.js index dc482a5c..e186f1df 100644 --- a/pywb/static/wb.js +++ b/pywb/static/wb.js @@ -63,8 +63,12 @@ this.create_banner_element = function() { this.ts_to_date = function(ts, is_gmt) { + if (!ts) { + return ""; + } + if (ts.length < 14) { - return ts; + ts += "00000000000000".substr(ts.length); } var datestr = (ts.substring(0, 4) + "-" + diff --git a/pywb/webapp/handlers.py b/pywb/webapp/handlers.py index 1191f2ec..eeab6dfa 100644 --- a/pywb/webapp/handlers.py +++ b/pywb/webapp/handlers.py @@ -108,7 +108,7 @@ class SearchPageWbUrlHandler(WbUrlHandler): def get_top_frame_response(self, wbrequest): params = self.get_top_frame_params(wbrequest, mod=self.replay_mod) - headers = [('Content-Type', 'text/html; charset=utf-8')] + headers = [('Content-Type', 'text/html')] status_headers = StatusAndHeaders('200 OK', headers) template_result = self.frame_insert_view.render_to_string(**params)