Merge pull request #385 from dotcloud/fix-#382

Fix #382
docker-archive · May 23, 2014 · 3858749 · 3858749
2 parents 6a6a3e1 + 3eea62a
commit 3858749
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/docker_registry/toolkit.py b/docker_registry/toolkit.py
@@ -82,12 +82,15 @@ def response(data=None, code=200, headers=None, raw=False):
         data = True
     h = {
         'Cache-Control': 'no-cache',
-        'Pragma': 'no-cache',
         'Expires': '-1',
         'Content-Type': 'application/json'
     }
     if headers:
         h.update(headers)
+
+    if h['Cache-Control'] == 'no-cache':
+        h['Pragma'] = 'no-cache'
+
     try:
         if raw is False:
             data = json.dumps(data, sort_keys=True, skipkeys=True)