fix: lua_newuserdata doesn't return aligned data in ARM64 (#37)

spacewander · web-flow · commit bb8f0f4cd0fb · 2022-03-18T20:54:11.000+08:00
diff --git a/patch/1.19.9/ngx_lua-enable_keepalive.patch b/patch/1.19.9/ngx_lua-enable_keepalive.patch
@@ -532,7 +532,7 @@ index e4ac57a..b5ffe2e 100644
      return rc;
  }
  
-@@ -403,24 +567,337 @@ static void
+@@ -403,24 +567,335 @@ static void
  ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
      ngx_uint_t state)
  {
@@ -716,8 +716,6 @@ index e4ac57a..b5ffe2e 100644
 +
 +    items = (ngx_http_lua_balancer_keepalive_item_t *) (&upool->free + 1);
 +
-+    ngx_http_lua_assert((void *) items == ngx_align_ptr(items, NGX_ALIGNMENT));
-+
 +    for (i = 0; i < cpool_size; i++) {
 +        ngx_queue_insert_head(&upool->free, &items[i].queue);
 +        items[i].cpool = upool;

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ index e4ac57a..b5ffe2e 100644`
`532`	`532`	`return rc;`
`533`	`533`	`}`
`534`	`534`
`535`		`-@@ -403,24 +567,337 @@ static void`
	`535`	`+@@ -403,24 +567,335 @@ static void`
`536`	`536`	`ngx_http_lua_balancer_free_peer(ngx_peer_connection_t pc, void data,`
`537`	`537`	`ngx_uint_t state)`
`538`	`538`	`{`
`@@ -716,8 +716,6 @@ index e4ac57a..b5ffe2e 100644`
`716`	`716`	`+`
`717`	`717`	`+ items = (ngx_http_lua_balancer_keepalive_item_t *) (&upool->free + 1);`
`718`	`718`	`+`
`719`		`-+ ngx_http_lua_assert((void *) items == ngx_align_ptr(items, NGX_ALIGNMENT));`
`720`		`-+`
`721`	`719`	`+ for (i = 0; i < cpool_size; i++) {`
`722`	`720`	`+ ngx_queue_insert_head(&upool->free, &items[i].queue);`
`723`	`721`	`+ items[i].cpool = upool;`