Skip to content

Conversation

@TimPushkin
Copy link
Contributor

@TimPushkin TimPushkin commented Aug 28, 2025

Backport of JDK-8347911 from JDK 17, for parity with Oracle 11.0.27.

No conflicts.

Testing: GitHub CI, jdk_imageio test group locally (mac/arm64)


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8347911 needs maintainer approval

Issue

  • JDK-8347911: Limit the length of inflated text chunks (Bug - P3 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/3083/head:pull/3083
$ git checkout pull/3083

Update a local copy of the PR:
$ git checkout pull/3083
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/3083/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3083

View PR using the GUI difftool:
$ git pr show -t 3083

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/3083.diff

Using Webrev

Link to Webrev Comment

GoeLin added 3 commits August 28, 2025 14:35
Backport-of: 70c6df6be431fe11c5441986ed04040f9ec3b750
Backport-of: 398a580518b4e7961bdddf733e0a89ff25bc437a
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 28, 2025

👋 Welcome back tpushkin! A progress list of the required criteria for merging this PR into pr/3082 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Aug 28, 2025

@TimPushkin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8347911: Limit the length of inflated text chunks

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport 398a580518b4e7961bdddf733e0a89ff25bc437a 8347911: Limit the length of inflated text chunks Aug 28, 2025
@openjdk
Copy link

openjdk bot commented Aug 28, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required rfr Pull request is ready for review labels Aug 28, 2025
@mlbridge
Copy link

mlbridge bot commented Aug 28, 2025

Webrevs

@TimPushkin
Copy link
Contributor Author

The CI failure seems unrelated, see #3081 (comment) for a discussion of a similar failure in a dependency.

@TimPushkin
Copy link
Contributor Author

/approval request Backporting for parity with Oracle.
Low risk: the change is limited to image IO in jdk.desktop, it has been running in newer LTS releases for a while now, the backport is clean.
Testing: GitHub CI, jdk_imageio test group locally (mac/arm64).

@openjdk
Copy link

openjdk bot commented Aug 29, 2025

@TimPushkin
8347911: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Aug 29, 2025
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 27, 2025

@TimPushkin This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@TimPushkin
Copy link
Contributor Author

/touch

@openjdk
Copy link

openjdk bot commented Sep 27, 2025

@TimPushkin The pull request is being re-evaluated and the inactivity timeout has been reset.

@sercher
Copy link

sercher commented Oct 3, 2025

Hi @TimPushkin
I am not sure #3082 is necessary for this backport. It seems that Oracle has ported 8347911 to 8 and 11 without it.

@TimPushkin
Copy link
Contributor Author

@sercher Hi, as I see it #3082 hass ben backported to both 11 and 8 by Oracle, maybe I am reading JBS wrong? It is certainly possible to backport this without #3082, it just won't be clean.

@sercher
Copy link

sercher commented Oct 3, 2025

@TimPushkin Apologies, you are correct. I was looking at the wrong issue.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/3082 to master October 21, 2025 14:53
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8347911-jdk11
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean Identical backport; no merge resolution required label Oct 21, 2025
@jerboaa
Copy link
Contributor

jerboaa commented Oct 21, 2025

@TimPushkin Please resolve the conflict here and merge latest master. Thanks!

@openjdk openjdk bot added clean Identical backport; no merge resolution required ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Oct 22, 2025
@TimPushkin
Copy link
Contributor Author

CI failures are caused by some infrastructure issues, not by the change: the jobs failed to download JTReg

@TimPushkin
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 22, 2025
@openjdk
Copy link

openjdk bot commented Oct 22, 2025

@TimPushkin
Your change (at version b90c5be) is now ready to be sponsored by a Committer.

@alexeybakhtin
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 22, 2025

Going to push as commit 085a7f1.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 22, 2025
@openjdk openjdk bot closed this Oct 22, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Oct 22, 2025
@openjdk
Copy link

openjdk bot commented Oct 22, 2025

@alexeybakhtin @TimPushkin Pushed as commit 085a7f1.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

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

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

5 participants