merge from master

2018-11-02 13:13:24 +08:00 · 2018-11-02 13:13:24 +08:00 · ce6e564f82
commit ce6e564f82
parent 6d2d42ee0b 7982beb5f2
86 changed files with 1448 additions and 3530 deletions
--- a/rootfs/etc/nginx/lua/test/balancer/sticky_test.lua
+++ b/rootfs/etc/nginx/lua/test/balancer/sticky_test.lua
@ -116,7 +116,8 @@ describe("Sticky", function()
          local cookie_instance = {
            set = function(self, payload)
              assert.equal(payload.key, test_backend.sessionAffinityConfig.cookieSessionAffinity.name)
-              assert.equal(payload.value, util[test_backend_hash_fn .. "_digest"](test_backend_endpoint))
+              local expected_len = #util[test_backend_hash_fn .. "_digest"]("anything")
+              assert.equal(#payload.value, expected_len)
              assert.equal(payload.path, ngx.var.location_path)
              assert.equal(payload.domain, nil)
              assert.equal(payload.httponly, true)