Skip to content

Fix redirect comparison to account for port difference #8977

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.

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
wants to merge 10 commits into
base: trunk
Choose a base branch
from

Conversation

wojtekn
Copy link

@wojtekn wojtekn commented Jun 13, 2025

Fix redirect comparison to account for port difference to ensure redirects from a requested URL that uses port to a canonical URL that doesn't use port work correctly.

Trac ticket: https://core.trac.wordpress.org/ticket/33821


This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.

Copy link

github-actions bot commented Jun 13, 2025

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

Core Committers: Use this line as a base for the props when committing in SVN:

Props wojtekn, sirlouen.

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

Copy link

Test using WordPress Playground

The changes in this pull request can previewed and tested using a WordPress Playground instance.

WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser.

Some things to be aware of

  • The Plugin and Theme Directories cannot be accessed within Playground.
  • All changes will be lost when closing a tab with a Playground instance.
  • All changes will be lost when refreshing the page.
  • A fresh instance is created each time the link below is clicked.
  • Every time this pull request is updated, a new ZIP file containing all changes is created. If changes are not reflected in the Playground instance,
    it's possible that the most recent build failed, or has not completed. Check the list of workflow runs to be sure.

For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation.

Test this pull request with WordPress Playground.

@@ -545,4 +545,94 @@ public function data_canonical_attachment_page_redirect_with_option_disabled() {
),
);
}
public function test_redirect_non_standard_localhost_port_to_canonical_domain() {

Choose a reason for hiding this comment

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

Can you add grouping with the ticket for all the tests that are relevant to #33821

Like

/* @ticket 33821

Also, will be good to add some little doc comments along with the ticket grouping

Like

/**
 * Test redirecting a non-standard localhost port to the canonical domain.
 *
 * @ticket 33821
 */

For all the provided tests.

update_option( 'home', 'http://example.com' );
update_option( 'siteurl', 'http://example.com' );

// Simulate a request to a non-canonical domain

Choose a reason for hiding this comment

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

Also its not required because phpunit doesnt have strict PHPCS rules, but ending comments in a full-stop is a good practice.

Copy link
Author

Choose a reason for hiding this comment

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

Actually, we do not need to simulate those $_SERVER variable here. They are used to assemble $request_url only when it's not provided to the function, but in all our tests we provide it. I cleaned that up.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants