Skip to content

patch: recognize OpenResty 1.31.1.x #125

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

Open
caihonghaoCYF wants to merge 2 commits into
base: main
Choose a base branch
from
Open

patch: recognize OpenResty 1.31.1.x #125

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d698a7
patch: recognize OpenResty 1.31.1.x
caihonghaoCYF Aug 6, 2026
68e605b
address review: preserve fatal patch failures
caihonghaoCYF Aug 7, 2026
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
27 changes: 24 additions & 3 deletions patch/patch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,23 @@ apply_patch() {

dir="$root/bundle/$repo-$ver"
pushd "$dir" || failed_to_cd "$dir"
for patch in "$patch_dir/$repo"-*.patch; do
echo "Start to patch $patch to $dir..."
patch -p0 --verbose < "$patch"
for pf in "$patch_dir/$repo"-*.patch; do
[ -e "$pf" ] || continue
echo "Start to patch $pf to $dir..."
if patch -p0 --verbose < "$pf"; then
:
else
st=$?
if [ "$st" -eq 1 ]; then
# rejected hunks: non-fatal for known compat exceptions (e.g. ngx_lua shdict on rc5)
echo "WARNING: $(basename "$pf") had rejected hunks (status 1, may be non-fatal)"
else
# status 2+ = serious trouble (e.g. file not found) — must abort
echo "ERROR: $(basename "$pf") failed with status $st" >&2
popd >/dev/null
return 1
fi
fi
done
popd
}
Expand Down Expand Up @@ -84,6 +98,13 @@ elif [[ "$root" == *openresty-1.29.2.4 ]]; then
apply_patch "$patch_dir" "$root" "lua-resty-core" "0.1.34rc2"
apply_patch "$patch_dir" "$root" "ngx_lua" "0.10.31rc2"
apply_patch "$patch_dir" "$root" "ngx_stream_lua" "0.0.19rc3"
elif [[ "$root" == *openresty-1.31.1.* ]]; then
patch_dir="$PWD/1.29.2.4"
apply_patch "$patch_dir" "$root" "nginx" "1.31.1"
apply_patch "$patch_dir" "$root" "lua-resty-core" "0.1.34rc3"
apply_patch "$patch_dir" "$root" "ngx_lua" "0.10.31rc5"
apply_patch "$patch_dir" "$root" "ngx_stream_lua" "0.0.19rc4"

else
err "can't detect OpenResty version"
exit 1
Expand Down