Skip to content

[WPB-5360] update the nginz nginx module to support nginx 1.26 #4042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MangoIV merged 1 commit into from
May 8, 2024
Merged

[WPB-5360] update the nginz nginx module to support nginx 1.26 #4042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nix/overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ self: super: {
};

nginz = (super.nginx.overrideAttrs rec {
version = "1.22.1";
version = "1.26.0";
src = super.fetchurl {
url = "https://nginx.org/download/nginx-${version}.tar.gz";
hash = "sha256-nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=";
hash = "sha256-0ubIQ51sbbUBXY6qskcKtSrvhae/NjGCh5l34IQ3BJc=";
Comment on lines +79 to +82

@MangoIV MangoIV May 7, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this override can also go in the next nixpkgs update. yay.

};
}).override {
modules = [
Expand Down
4 changes: 2 additions & 2 deletions services/nginz/third_party/nginx-zauth-module/zauth_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,8 @@ static ngx_int_t zauth_parse_request (ngx_http_request_t * r) {
} else {
ngx_str_t name = ngx_string("zprovider");
ngx_str_t cookie = ngx_null_string;
ngx_int_t index = ngx_http_parse_multi_header_lines(&r->headers_in.cookies, &name, &cookie);
if (index != NGX_DECLINED) {
ngx_table_elt_t* cookie_header = ngx_http_parse_multi_header_lines(r, r->headers_in.cookie, &name, &cookie);
if (cookie_header != NULL) {
res = zauth_token_parse(cookie.data, cookie.len, &tkn);
}
}
Expand Down