aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/net
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2019-07-17 22:43:14 +0200
committerGitHub <noreply@github.com>2019-07-17 22:43:14 +0200
commit69a3f772565b43ceaa01c9ddd72a0d0ff5c94acb (patch)
tree8f45622df9ff462217b91f497ea7ae8c90ea3b14 /mitmproxy/net
parent386772f8fc38a6850e3774ff2526af2bba7c333f (diff)
parenta8489466c1b10af6a7510759362b9b930e6852f0 (diff)
downloadmitmproxy-69a3f772565b43ceaa01c9ddd72a0d0ff5c94acb.tar.gz
mitmproxy-69a3f772565b43ceaa01c9ddd72a0d0ff5c94acb.tar.bz2
mitmproxy-69a3f772565b43ceaa01c9ddd72a0d0ff5c94acb.zip
Merge pull request #3525 from tonyb486/bugfix-dateheader
Fix #3502 by using email.utils.formatdate's usegmt argument.
Diffstat (limited to 'mitmproxy/net')
-rw-r--r--mitmproxy/net/http/cookies.py2
-rw-r--r--mitmproxy/net/http/response.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/net/http/cookies.py b/mitmproxy/net/http/cookies.py
index 1472ab55..2745701f 100644
--- a/mitmproxy/net/http/cookies.py
+++ b/mitmproxy/net/http/cookies.py
@@ -304,7 +304,7 @@ def refresh_set_cookie_header(c: str, delta: int) -> str:
e = email.utils.parsedate_tz(attrs["expires"])
if e:
f = email.utils.mktime_tz(e) + delta
- attrs.set_all("expires", [email.utils.formatdate(f)])
+ attrs.set_all("expires", [email.utils.formatdate(f, usegmt=True)])
else:
# This can happen when the expires tag is invalid.
# reddit.com sends a an expires tag like this: "Thu, 31 Dec
diff --git a/mitmproxy/net/http/response.py b/mitmproxy/net/http/response.py
index 48527d63..9491fc03 100644
--- a/mitmproxy/net/http/response.py
+++ b/mitmproxy/net/http/response.py
@@ -186,7 +186,7 @@ class Response(message.Message):
d = parsedate_tz(self.headers[i])
if d:
new = mktime_tz(d) + delta
- self.headers[i] = formatdate(new)
+ self.headers[i] = formatdate(new, usegmt=True)
c = []
for set_cookie_header in self.headers.get_all("set-cookie"):
try: