Skip to content
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

Jump to bottom

fix(cjson): port cjson fix that throws error when T_END found in the #12904

Merged
merged 1 commit into from
Apr 24, 2024
Merged

fix(cjson): port cjson fix that throws error when T_END found in the #12904

merged 1 commit into from
Apr 24, 2024

Conversation

fffonion
Copy link
Contributor

@fffonion fffonion commented Apr 23, 2024 •
edited
Loading

middle

Summary

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Fix #[issue number]

Kong/lua-cjson#1

KAG-4275

@github-actions github-actions bot added build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Apr 23, 2024
@pull-request-size pull-request-size bot added size/S and removed size/M labels Apr 23, 2024
@bungle
Copy link
Member

bungle commented Apr 23, 2024 •
edited
Loading

@fffonion can you rename:
build/openresty/patches/lua-cjson-2.1.0.13-error-on-t_end.patch to build/openresty/patches/lua-cjson-2.1.0.13_01-error-on-t_end.patch

Also make sure that patch applies cleanly (aka fix the offset):

patching file bundle/lua-cjson-2.1.0.13/lua_cjson.c
Hunk #1 succeeded at 1437 (offset -4 lines).

bungle
bungle requested changes Apr 23, 2024
View reviewed changes
Copy link
Member

@bungle bungle left a comment

Choose a reason for hiding this comment

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

See above ^

@bungle bungle merged commit 28ff0cb into master Apr 24, 2024
26 checks passed
@bungle bungle deleted the cjson-fix branch April 24, 2024 08:33
@team-gateway-bot
Copy link
Collaborator

Successfully created cherry-pick PR for master:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chronolaw chronolaw chronolaw approved these changes

@bungle bungle bungle approved these changes

Assignees

@fffonion fffonion

Labels
build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee size/S
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@fffonion @bungle @team-gateway-bot @chronolaw