Merge pull request #532 from d00rman/parsoid/ensure-headers

Parsoid: Ensure res.headers is set before setting cache-control
wikimedia · Mar 2, 2016 · 3adbce0 · 3adbce0
2 parents dad16c2 + f5b978a
commit 3adbce0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "restbase",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "REST storage and service dispatcher",
   "main": "lib/server.js",
   "scripts": {

diff --git a/sys/parsoid.js b/sys/parsoid.js
@@ -486,13 +486,13 @@ PSP.getFormat = function(format, hyper, req) {
     return contentReq
     .then(function(res) {
         mwUtil.normalizeContentType(res);
-        if (self.options.response_cache_control) {
-            res.headers['cache-control'] = self.options.response_cache_control;
-        }
         HyperSwitch.misc.addCSPHeaders(res, {
             domain: rp.domain,
             allowInline: true,
         });
+        if (self.options.response_cache_control) {
+            res.headers['cache-control'] = self.options.response_cache_control;
+        }
         return res;
     });
 };