From 133377c424cd93bf777c709728b554afe8af48b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 20 Sep 2016 15:09:47 +0200 Subject: [PATCH] Also allow None for lastmodified and etag value --- src/octoprint/server/util/flask.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index 6885a1b3..4d335a86 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -892,12 +892,18 @@ def with_revalidation_checking(etag_factory=None, def check_etag(etag): + if etag is None: + return False + return flask.request.method in ("GET", "HEAD") and \ flask.request.if_none_match is not None and \ etag in flask.request.if_none_match def check_lastmodified(lastmodified): + if lastmodified is None: + return False + from datetime import datetime if isinstance(lastmodified, (float, int)): lastmodified = datetime.fromtimestamp(lastmodified).replace(microsecond=0)