Skip to content

Commit

Permalink
chore(deps) bump Nginx to 1.27.2
Browse files Browse the repository at this point in the history
  • Loading branch information
thibaultcha committed Oct 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent a365850 commit c9b3f86
Showing 5 changed files with 27 additions and 23 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci-large.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ jobs:
label: [""]
os: [ubuntu-latest]
cc: [gcc-12]
ngx: [1.27.1]
ngx: [1.27.2]
runtime: [wasmtime, wasmer, v8]
wasmtime: [25.0.1]
wasmer: [3.1.1]
@@ -52,7 +52,7 @@ jobs:
wasmer: 3.1.1
os: macos-13
cc: clang
ngx: 1.27.1
ngx: 1.27.2
ssl: ssl
debug: debug
hup: no_hup
@@ -62,7 +62,7 @@ jobs:
wasmtime: 25.0.1
os: macos-13
cc: clang
ngx: 1.27.1
ngx: 1.27.2
ssl: ssl
debug: debug
hup: hup
@@ -72,7 +72,7 @@ jobs:
v8: 12.0.267.17
os: macos-13
cc: clang
ngx: 1.27.1
ngx: 1.27.2
ssl: ssl
debug: debug
hup: no_hup
@@ -101,7 +101,7 @@ jobs:
matrix:
os: [ubuntu-22.04]
cc: [gcc-12]
ngx: [1.27.1]
ngx: [1.27.2]
runtime: [wasmer, wasmtime, v8]
wasmtime: [25.0.1]
wasmer: [3.1.1]
@@ -169,7 +169,7 @@ jobs:
label: [""]
os: [ubuntu-latest]
cc: [clang-13, clang-14, gcc-10, gcc-11]
ngx: [1.27.1]
ngx: [1.27.2]
runtime: [wasmtime, wasmer, v8]
wasmtime: [25.0.1]
wasmer: [3.1.1]
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ jobs:
label: [""]
os: [ubuntu-latest]
cc: [gcc-12]
ngx: [1.27.1]
ngx: [1.27.2]
openresty: [""]
runtime: [wasmer]
wasmtime: [""]
@@ -50,7 +50,7 @@ jobs:
wasmtime: 25.0.1
os: ubuntu-latest
cc: gcc-12
ngx: 1.27.1
ngx: 1.27.2
ipc: no_ipc
ssl: ssl
debug: debug
@@ -60,7 +60,7 @@ jobs:
v8: 12.0.267.17
os: ubuntu-latest
cc: gcc-12
ngx: 1.27.1
ngx: 1.27.2
ipc: no_ipc
ssl: ssl
debug: debug
@@ -70,7 +70,7 @@ jobs:
wasmtime: 25.0.1
os: ubuntu-latest
cc: gcc-12
ngx: 1.27.1
ngx: 1.27.2
ipc: no_ipc
ssl: no_ssl
debug: debug
@@ -91,7 +91,7 @@ jobs:
- label: dynamic_nginx
os: ubuntu-latest
cc: gcc-12
ngx: 1.27.1
ngx: 1.27.2
runtime: wasmtime
wasmtime: 25.0.1
ipc: no_ipc
@@ -102,7 +102,7 @@ jobs:
# No SSL
- os: ubuntu-latest
cc: gcc-12
ngx: 1.27.1
ngx: 1.27.2
runtime: wasmer
wasmer: 3.1.1
ipc: no_ipc
@@ -136,7 +136,7 @@ jobs:
- label: ipc
os: ubuntu-latest
cc: gcc-12
ngx: 1.27.1
ngx: 1.27.2
runtime: wasmtime
wasmtime: 25.0.1
ipc: ipc
@@ -174,7 +174,7 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
carryforward: 'unit-ngx_1.27.1-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.1-wasmer-no_ipc-ssl-no_debug-no_hup-static,unit-ngx_1.27.1-wasmtime-no_ipc-ssl-debug-hup-static,unit-ngx_1.27.1-wasmtime-no_ipc-ssl-debug-hup-dynamic,unit-ngx_1.27.1-v8-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.1-wasmtime-no_ipc-no_ssl-debug-no_hup-static-wasm32-unknown-unknown,unit-ngx_1.21.6-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.1-wasmer-no_ipc-no_ssl-no_debug-no_hup-static,unit-openresty_1.25.3.2-wasmtime-no_ipc-ssl-debug-no_hup-static,unit-openresty_1.25.3.2-wasmtime-no_ipc-ssl-debug-no_hup-dynamic,unit-ngx_1.27.1-wasmtime-ipc-no_ssl-debug-no_hup-static'
carryforward: 'unit-ngx_1.27.2-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.2-wasmer-no_ipc-ssl-no_debug-no_hup-static,unit-ngx_1.27.2-wasmtime-no_ipc-ssl-debug-hup-static,unit-ngx_1.27.2-wasmtime-no_ipc-ssl-debug-hup-dynamic,unit-ngx_1.27.2-v8-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.2-wasmtime-no_ipc-no_ssl-debug-no_hup-static-wasm32-unknown-unknown,unit-ngx_1.21.6-wasmer-no_ipc-ssl-debug-no_hup-static,unit-ngx_1.27.2-wasmer-no_ipc-no_ssl-no_debug-no_hup-static,unit-openresty_1.25.3.2-wasmtime-no_ipc-ssl-debug-no_hup-static,unit-openresty_1.25.3.2-wasmtime-no_ipc-ssl-debug-no_hup-dynamic,unit-ngx_1.27.2-wasmtime-ipc-no_ssl-debug-no_hup-static'

valgrind:
name: 'Valgrind'
@@ -188,7 +188,7 @@ jobs:
wasmer: [3.1.1]
os: [ubuntu-22.04]
cc: [gcc-12]
ngx: [1.27.1]
ngx: [1.27.2]
openresty: [""]
wasmtime: [""]
v8: [""]
@@ -200,7 +200,7 @@ jobs:
wasmtime: 25.0.1
os: ubuntu-22.04
cc: gcc-12
ngx: 1.27.1
ngx: 1.27.2
hup: no_hup
debug: debug
path: t/01-wasm
@@ -209,7 +209,7 @@ jobs:
v8: 12.0.267.17
os: ubuntu-22.04
cc: gcc-12
ngx: 1.27.1
ngx: 1.27.2
debug: debug
hup: no_hup
path: t/01-wasm
@@ -297,7 +297,7 @@ jobs:
# No SSL
- os: ubuntu-latest
cc: clang-15
ngx: 1.27.1
ngx: 1.27.2
runtime: wasmer
wasmer: 3.1.1
ssl: no_ssl
@@ -323,7 +323,7 @@ jobs:
matrix:
os: [ubuntu-latest]
cc: [clang-15, gcc-12]
ngx: [1.27.1]
ngx: [1.27.2]
runtime: [wasmtime, wasmer, v8]
wasmtime: [25.0.1]
wasmer: [3.1.1]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NGX ?= 1.27.1
NGX ?= 1.27.2
OPENSSL ?= 3.3.2
WASMTIME ?= 25.0.1
WASMER ?= 3.1.1
4 changes: 4 additions & 0 deletions src/common/ngx_wasm_socket_tcp_readers.c
Original file line number Diff line number Diff line change
@@ -398,7 +398,11 @@ ngx_wasm_read_http_response(ngx_buf_t *src, ngx_chain_t *buf_in, ssize_t bytes,

/* Transfer-Encoding: chunked */

#if nginx_version >= 1027002
rc = ngx_http_parse_chunked(r, src, &in_ctx->chunked, 0);
#else
rc = ngx_http_parse_chunked(r, src, &in_ctx->chunked);
#endif
if (rc == NGX_ERROR || rc == NGX_AGAIN) {
return rc;
}
6 changes: 3 additions & 3 deletions valgrind.suppress
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
<nginx 1.27.1: ngx_set_environment>
<nginx 1.27.2: ngx_set_environment>
Memcheck:Leak
match-leak-kinds: definite
fun:malloc
fun:ngx_alloc
fun:ngx_set_environment
}
{
<nginx 1.27.1: ngx_event_process_init>
<nginx 1.27.2: ngx_event_process_init>
Memcheck:Leak
fun:malloc
fun:ngx_alloc
fun:ngx_event_process_init
}
{
<nginx 1.27.1: ngx_crc32_table_init>
<nginx 1.27.2: ngx_crc32_table_init>
Memcheck:Leak
match-leak-kinds: possible
fun:malloc

0 comments on commit c9b3f86

Please sign in to comment.