Merge pull request #1713 from LLK/hotfix/project-caching

[Develop] Hotfix/project caching

bin/configure-fastly.js

@@ -67,8 +67,8 @@ async.auto({
                          'std.tolower(req.http.Accept-Language)' +
                      ');\n' +
             '    }\n' +
-            '    if (req.url ~ "^/projects/" && !req.http.Cookie:scratchsessionid) {\n' +
-            '        set req.http.Cookie = req.http.Cookie:scratchlanguage;\n' +
+            '    if (req.url ~ "^/projects/" && !req.http.Cookie:scratchsessionsid) {\n' +
+            '        set req.http.Cookie = "scratchlanguage=" req.http.Cookie:scratchlanguage;\n' +
             '    } else {\n' +
             '        return(pass);\n' +
             '    }\n' +

bin/lib/fastly-config-methods.js

@@ -93,8 +93,10 @@ var FastlyConfigMethods = {
     setResponseTTL: function (condition) {
         return '' +
             'if (' + condition + ') {\n' +
-            '    if (req.url ~ "^/projects/" && !req.http.Cookie:scratchsessionid) {\n' +
+            '    if (req.url ~ "^/projects/" && !req.http.Cookie:scratchsessionsid) {\n' +
             '        set beresp.http.Vary = "Accept-Encoding, Accept-Language";\n' +
+            '        unset beresp.http.set-cookie;\n' +
+            '        return(deliver);\n' +
             '    } else {\n' +
             '        set beresp.ttl = 0s;\n' +
             '        set beresp.grace = 0s;\n' +

test/unit/test_fastly_config_methods.js

@@ -63,8 +63,10 @@ tap.test('testSetTTL', function (t) {
     var ttl = fastlyConfig.setResponseTTL('itsactuallyttyl');
     t.equal(ttl, '' +
         'if (itsactuallyttyl) {\n' +
-        '    if (req.url ~ "^/projects/" && !req.http.Cookie:scratchsessionid) {\n' +
+        '    if (req.url ~ "^/projects/" && !req.http.Cookie:scratchsessionsid) {\n' +
         '        set beresp.http.Vary = "Accept-Encoding, Accept-Language";\n' +
+        '        unset beresp.http.set-cookie;\n' +
+        '        return(deliver);\n' +
         '    } else {\n' +
         '        set beresp.ttl = 0s;\n' +
         '        set beresp.grace = 0s;\n' +