|
1 | 1 | diff --git src/ngx_http_lua_balancer.c src/ngx_http_lua_balancer.c |
2 | | -index ae0f1380..8345026d 100644 |
| 2 | +index ae0f1380..a00286c2 100644 |
3 | 3 | --- src/ngx_http_lua_balancer.c |
4 | 4 | +++ src/ngx_http_lua_balancer.c |
5 | 5 | @@ -31,10 +31,39 @@ typedef struct { |
@@ -614,18 +614,19 @@ index ae0f1380..8345026d 100644 |
614 | 614 | /* TODO */ |
615 | 615 | return; |
616 | 616 | } |
617 | | -@@ -860,8 +1039,8 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data) |
| 617 | +@@ -859,9 +1038,8 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data) |
| 618 | + |
618 | 619 | int |
619 | 620 | ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r, |
620 | | - const u_char *addr, size_t addr_len, int port, |
| 621 | +- const u_char *addr, size_t addr_len, int port, |
621 | 622 | - const u_char *host, size_t host_len, |
622 | 623 | - char **err) |
623 | | -+ const u_char *host, size_t host_len, unsigned int cpool_crc32, |
| 624 | ++ const u_char *addr, size_t addr_len, int port, unsigned int cpool_crc32, |
624 | 625 | + unsigned int cpool_size, char **err) |
625 | 626 | { |
626 | 627 | ngx_url_t url; |
627 | 628 | ngx_http_lua_ctx_t *ctx; |
628 | | -@@ -927,25 +1106,8 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r, |
| 629 | +@@ -927,25 +1105,8 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r, |
629 | 630 | return NGX_ERROR; |
630 | 631 | } |
631 | 632 |
|
@@ -653,7 +654,7 @@ index ae0f1380..8345026d 100644 |
653 | 654 |
|
654 | 655 | return NGX_OK; |
655 | 656 | } |
656 | | -@@ -1050,11 +1212,15 @@ ngx_http_lua_ffi_balancer_enable_keepalive(ngx_http_request_t *r, |
| 657 | +@@ -1050,11 +1211,15 @@ ngx_http_lua_ffi_balancer_enable_keepalive(ngx_http_request_t *r, |
657 | 658 |
|
658 | 659 | bp = (ngx_http_lua_balancer_peer_data_t *) u->peer.data; |
659 | 660 |
|
|
0 commit comments