patch: recognize OpenResty 1.31.1.x

[caihonghaoCYF]

Add OpenResty 1.31.1.1 support to the APISIX build toolchain

The changes below are provided as git format-patch files (one per repo).
Apply with git am <NN-*.patch> (or git apply <NN-*.patch>), then open a PR.
Each patch already contains a commit message.

TL;DR

OpenResty 1.31.1.1 (the latest release) builds and runs for APISIX with no C
source changes — the only blocker was a version-string whitelist in two patch.sh
scripts. This change adds the missing 1.31.1.* branch in each of them and bumps the
build-tools default. Validated end-to-end: openresty/1.31.1.1 + all APISIX nginx
modules compile/link/run, and APISIX 3.17.0 starts, loads all plugins, and proxies
traffic with 0 errors.

It spans 3 repos (build-tools is the orchestrator; the two patch.sh live in the
module repos):

Repo	Patch	Change
api7/apisix-build-tools	01-apisix-build-tools-openresty-1.31.1.1.patch	default OPENRESTY_VERSION → 1.31.1.1
api7/ngx_multi_upstream_module	02-ngx_multi_upstream_module-openresty-1.31.1.1.patch	patch.sh: recognize openresty-1.31.1.*
api7/apisix-nginx-module	03-apisix-nginx-module-openresty-1.31.1.1.patch	patch/patch.sh: recognize openresty-1.31.1.* + tolerate non-fatal hunk rejects

Background

build-apisix-runtime.sh clones each nginx module and runs its patch.sh, which patches
nginx core plus the lua modules bundled inside OpenResty. Each patch.sh has a hard-coded
list of supported OpenResty versions:

1.19.3, 1.19.9, 1.21.4, 1.25.3, 1.27.1, 1.29.2   ← highest supported
else → "can't detect OpenResty version" + exit 1

So 1.31.1.1 was rejected at the gate, before any patching. Once the branch is added,
the existing patch files apply cleanly to 1.31.1 (nginx core 1.29.2 → 1.31.1 did not
touch the patched locations; the bundled lua components only moved one rc: lua-resty-core 0.1.34rc2→rc3, ngx_lua 0.10.31rc2→rc5, ngx_stream_lua 0.0.19rc3→rc4).

The one non-fatal reject (ngx_lua shared_shdict)

patch/1.29.2.4/ngx_lua-shared_shdict.patch removes ngx_lua's built-in shdict (APISIX ships
its own via lua-resty-core/shared_shdict). On ngx_lua-0.10.31rc5, one hunk of this
patch rejects (context drift in src/ngx_http_lua_shdict.c). It is non-fatal: the build
completes and APISIX runs correctly (it does not use ngx_lua's built-in shdict).

Patch 03 therefore makes apply_patch() warn-and-continue on a rejected hunk instead of
aborting the whole build (set -e). Recommended follow-up: refresh
ngx_lua-shared_shdict.patch against rc5 so the reject disappears and the tolerance change
can be reverted. Left to maintainers who know the shdict code best.

How to apply (3 PRs)

Each patch is a standard git format-patch output (git am / git apply compatible):

git clone https://github.com/<your-fork>/<repo>.git && cd <repo>
git checkout -b feat/openresty-1.31.1.1
git am /path/to/0<N>-<repo>-openresty-1.31.1.1.patch   # applies + creates the commit
git push origin feat/openresty-1.31.1.1
# open a PR; paste the relevant section of this README as the PR description

Suggested order: merge the two module PRs first (ngx_multi_upstream_module,
apisix-nginx-module), then the build-tools default-version PR.

Validation (reproduction)

Built on Ubuntu 22.04 x86_64 (gcc 11.4), with the 3 patches applied and
OPENRESTY_VERSION=1.31.1.1:

Check	Result
Patch application	all apply, 1 non-fatal reject (ngx_lua shdict hunk)
./configure	OK
make -j	0 compile errors, 0 link errors
nginx -v	openresty/1.31.1.1
nginx -V	all modules compiled in (apisix-nginx-module, ngx_multi_upstream_module, mod_dubbo, wasm-nginx-module, lua-var-nginx-module, lua-resty-events)
ldd nginx	no "not found"
APISIX 3.17.0 luarocks make (84 rocks)	OK
apisix start (standalone)	listens on 9080, error.log [error] = 0
reverse proxy	curl /hello proxied to upstream (upstream response forwarded)
glibc symbols	max GLIBC_2.34 → output also runs on el9 (glibc 2.34)

apisix_nginx_module_ver etc. in build-apisix-runtime.sh (currently 1.19.8 / 1.3.3 /
0.7.0 / v0.5.3 / 0.2.0) are unchanged — those module releases already work with
1.31.1 once their patch.sh recognizes it.

Why this matters

APISIX's OpenResty fork always lags vanilla OpenResty because of these required core patches.
1.31.1.1 brings nginx 1.31.1 (HTTP/3, security fixes). This contribution closes that gap with
minimal, low-risk changes (version-string branches + one tolerance tweak), backed by a full
build + run validation.

Summary by CodeRabbit

• New Features
  • Added support for OpenResty 1.31.1 installation paths.
  • Updated patch handling to target the OpenResty 1.31.1 bundle.

[CLAassistant]

All committers have signed the CLA.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 8dd3d964-044b-45be-ae26-0c149ed47ccf

📥 Commits

Reviewing files that changed from the base of the PR and between 3ac93f2 and a76d87c.

📒 Files selected for processing (1)

• patch.sh

---

📝 Walkthrough

Walkthrough

The patch script now supports OpenResty 1.31.1. It selects the existing nginx 1.29.2 patch and targets bundle/nginx-1.31.1.

Changes

OpenResty version support

Layer / File(s)	Summary
OpenResty 1.31.1 version branch patch.sh	The script maps OpenResty 1.31.1 to the nginx 1.29.2 patch and the bundle/nginx-1.31.1 directory.

Estimated code review effort: 1 (Trivial) | ~2 minutes

🚥 Pre-merge checks | ✅ 5 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
E2e Test Quality Review	⚠️ Warning	The commit changes only patch.sh; HEAD contains no E2E, test, or CI files, so the claimed manual validation is not a repeatable full-flow test.	Add a repeatable E2E/CI test for OpenResty 1.31.1.1 patching, plus unsupported-version, missing-path, patch-failure, and runtime failure scenarios.

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly describes the main change: recognizing OpenResty 1.31.1.x.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Security Check	✅ Passed	The commit changes only three version-path lines in patch.sh; no credential handling, persistence, authorization, ownership, TLS, shared-resource, or secret-reference logic is added.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}