Skip to content

Fix blob retrieval with an empty Accept header - #2545

Merged
gerrod3 merged 2 commits into
pulp:mainfrom
am9zZWY:fix/empty-accept-header
Oct 20, 2026
Merged

gerrod3 merged 2 commits into
pulp:mainfrom
am9zZWY:fix/empty-accept-header

Conversation

@am9zZWY

@am9zZWY am9zZWY commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

📜 Checklist

Closes #2544

  • Commits are cleanly separated with meaningful messages (simple features and bug fixes should be squashed to one commit)
  • A changelog entry or entries has been added for any significant changes
  • Follows the Pulp policy on AI Usage
  • (For new features) - User documentation and test coverage has been added

See: Pull Request Walkthrough

Comment thread pulp_container/tests/functional/api/test_pull_content.py Outdated
Comment thread pulp_container/tests/unit/test_blob_content_negotiation.py Outdated
@am9zZWY
am9zZWY force-pushed the fix/empty-accept-header branch from 619dfa3 to 6396adf Compare October 9, 2026 16:32
@am9zZWY
am9zZWY force-pushed the fix/empty-accept-header branch from 2389596 to e999d3d Compare October 12, 2026 09:01
@am9zZWY
am9zZWY requested a review from gerrod3 October 12, 2026 13:00
@gerrod3
gerrod3 merged commit 95835e5 into pulp:main Oct 20, 2026
14 checks passed
@patchback

patchback Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Backport to 2.19: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 95835e5 on top of patchback/backports/2.19/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545

Backporting merged PR #2545 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    git remote add upstream https://github.com/pulp/pulp_container.git
    
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    git fetch upstream
    git checkout -b patchback/backports/2.19/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545 upstream/2.19
    
  4. Now, cherry-pick PR Fix blob retrieval with an empty Accept header #2545 contents into that branch:
    git cherry-pick -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
    If it'll yell at you with something like fatal: Commit 95835e577884b9578c82de6983dbc53f67f8d3e1 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR Fix blob retrieval with an empty Accept header #2545 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/2.19/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545
    
  8. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Backport to 2.20: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 95835e5 on top of patchback/backports/2.20/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545

Backporting merged PR #2545 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    git remote add upstream https://github.com/pulp/pulp_container.git
    
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    git fetch upstream
    git checkout -b patchback/backports/2.20/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545 upstream/2.20
    
  4. Now, cherry-pick PR Fix blob retrieval with an empty Accept header #2545 contents into that branch:
    git cherry-pick -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
    If it'll yell at you with something like fatal: Commit 95835e577884b9578c82de6983dbc53f67f8d3e1 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR Fix blob retrieval with an empty Accept header #2545 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/2.20/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545
    
  8. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Backport to 2.26: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 95835e5 on top of patchback/backports/2.26/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545

Backporting merged PR #2545 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    git remote add upstream https://github.com/pulp/pulp_container.git
    
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    git fetch upstream
    git checkout -b patchback/backports/2.26/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545 upstream/2.26
    
  4. Now, cherry-pick PR Fix blob retrieval with an empty Accept header #2545 contents into that branch:
    git cherry-pick -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
    If it'll yell at you with something like fatal: Commit 95835e577884b9578c82de6983dbc53f67f8d3e1 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR Fix blob retrieval with an empty Accept header #2545 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/2.26/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545
    
  8. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Backport to 2.22: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 95835e5 on top of patchback/backports/2.22/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545

Backporting merged PR #2545 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    git remote add upstream https://github.com/pulp/pulp_container.git
    
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    git fetch upstream
    git checkout -b patchback/backports/2.22/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545 upstream/2.22
    
  4. Now, cherry-pick PR Fix blob retrieval with an empty Accept header #2545 contents into that branch:
    git cherry-pick -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
    If it'll yell at you with something like fatal: Commit 95835e577884b9578c82de6983dbc53f67f8d3e1 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR Fix blob retrieval with an empty Accept header #2545 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/2.22/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545
    
  8. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Backport to 2.24: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 95835e5 on top of patchback/backports/2.24/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545

Backporting merged PR #2545 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    git remote add upstream https://github.com/pulp/pulp_container.git
    
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    git fetch upstream
    git checkout -b patchback/backports/2.24/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545 upstream/2.24
    
  4. Now, cherry-pick PR Fix blob retrieval with an empty Accept header #2545 contents into that branch:
    git cherry-pick -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
    If it'll yell at you with something like fatal: Commit 95835e577884b9578c82de6983dbc53f67f8d3e1 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR Fix blob retrieval with an empty Accept header #2545 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/2.24/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545
    
  8. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Backport to 2.27: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 95835e5 on top of patchback/backports/2.27/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545

Backporting merged PR #2545 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    git remote add upstream https://github.com/pulp/pulp_container.git
    
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    git fetch upstream
    git checkout -b patchback/backports/2.27/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545 upstream/2.27
    
  4. Now, cherry-pick PR Fix blob retrieval with an empty Accept header #2545 contents into that branch:
    git cherry-pick -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
    If it'll yell at you with something like fatal: Commit 95835e577884b9578c82de6983dbc53f67f8d3e1 is a merge but no -m option was given., add -m 1 as follows instead:
    git cherry-pick -m1 -x 95835e577884b9578c82de6983dbc53f67f8d3e1
    
  5. At this point, you'll encounter some merge conflicts. You must
    resolve them in order to preserve the patch from PR Fix blob retrieval with an empty Accept header #2545 as close to the
    original as possible.
  6. Once conflicts are resolved and git added, run:
    git cherry-pick --continue
    
  7. Push this branch to your fork on GitHub:
    git push origin patchback/backports/2.27/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545
    
  8. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Backport to 2.30: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.30/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545

Backported as #2591

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@patchback

patchback Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Backport to 2.29: 💚 backport PR created

✅ Backport PR branch: patchback/backports/2.29/95835e577884b9578c82de6983dbc53f67f8d3e1/pr-2545

Backported as #2592

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

gerrod3 pushed a commit that referenced this pull request Oct 21, 2026
* fix: fix blob retrieval with an empty Accept header

(cherry picked from commit 95835e5)
gerrod3 pushed a commit that referenced this pull request Oct 21, 2026
* fix: fix blob retrieval with an empty Accept header

(cherry picked from commit 95835e5)
@am9zZWY
am9zZWY deleted the fix/empty-accept-header branch October 23, 2026 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Blob endpoint returns 406 for an empty Accept header

2 participants