From 6c8cb806d9fad73fa4a2a14d304216f4710edbe0 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Sat, 28 Feb 2015 09:04:15 -0800 Subject: [PATCH 1/3] update 0.8.2 changelist, minor fixes --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 56045c8b..7539b88a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ pywb 0.8.2 changelist ~~~~~~~~~~~~~~~~~~~~~ +* rewrite: fix for redirect loop related to pages with 'www.' prefix. Since canonicalization removes the prefix, treat redirect to 'www.' as self-redirect (for now). + +* memento: ensure rel=memento url matches timegate redirect exactly (urls may differ due to canonicalization, use actual instead of requested for both) + + pywb 0.8.1 changelist ~~~~~~~~~~~~~~~~~~~~~ From f2d7bd074a7326a2a7083317c6a227d1e8f15186 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 5 Mar 2015 16:18:56 -0800 Subject: [PATCH 2/3] bump version to 0.8.3 cookie rewrite: remove 'secure' flag if present --- CHANGES.rst | 6 ++++++ README.rst | 2 +- pywb/rewrite/cookie_rewriter.py | 5 +++++ setup.py | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 7539b88a..335f43f6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +pywb 0.8.3 changelist +~~~~~~~~~~~~~~~~~~~~~ + +* cookie rewrite: remove cookie ``secure`` flag to allow equivalent replay via http as well as https + + pywb 0.8.2 changelist ~~~~~~~~~~~~~~~~~~~~~ diff --git a/README.rst b/README.rst index d8d85c2d..444cbae6 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -PyWb 0.8.2 +PyWb 0.8.3 ========== .. image:: https://travis-ci.org/ikreymer/pywb.png?branch=develop diff --git a/pywb/rewrite/cookie_rewriter.py b/pywb/rewrite/cookie_rewriter.py index 63db9a93..c17d0dad 100644 --- a/pywb/rewrite/cookie_rewriter.py +++ b/pywb/rewrite/cookie_rewriter.py @@ -32,6 +32,11 @@ class WbUrlBaseCookieRewriter(object): if morsel.get('max-age'): del morsel['max-age'] + # for now, also remove secure to avoid issues when + # proxying over plain http (TODO: detect https?) + if morsel.get('secure'): + del morsel['secure'] + #================================================================= class MinimalScopeCookieRewriter(WbUrlBaseCookieRewriter): diff --git a/setup.py b/setup.py index e88cdb42..478630fe 100755 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ class PyTest(TestCommand): setup( name='pywb', - version='0.8.2', + version='0.8.3', url='https://github.com/ikreymer/pywb', author='Ilya Kreymer', author_email='ikreymer@gmail.com', From 1fb631870b01e041b74f056eef68359d1ccccfaa Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 5 Mar 2015 17:04:44 -0800 Subject: [PATCH 3/3] wb_frame: fix extra slash typo in replaced frame url --- pywb/static/wb_frame.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywb/static/wb_frame.js b/pywb/static/wb_frame.js index 79642db1..640b3e88 100644 --- a/pywb/static/wb_frame.js +++ b/pywb/static/wb_frame.js @@ -38,7 +38,7 @@ function make_inner_url(url, ts) if (ts) { return wbinfo.prefix + ts + "/" + url; } else { - return wbinfo.prefix + "/" + url; + return wbinfo.prefix + url; } }