Merge branch 'develop' into config-work

CHANGES.rst

@@ -1,6 +1,17 @@
+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
 ~~~~~~~~~~~~~~~~~~~~~
 
+* 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
 ~~~~~~~~~~~~~~~~~~~~~
 

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):

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;
     }
 }