From 1767706fc279be4a234778ff7572677cdd3fa8cf Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Wed, 29 Oct 2014 18:36:41 +0000 Subject: [PATCH] Revert [28610] in order to avoid infinite redirect loops on reverse proxies which proxy from HTTPS to HTTP. This will be revisited at some point, possibly as an option via a filter. Fixes #28610. git-svn-id: https://develop.svn.wordpress.org/trunk@30090 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/canonical.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/wp-includes/canonical.php b/src/wp-includes/canonical.php index 02a7bbd8e4..d5b749ce38 100644 --- a/src/wp-includes/canonical.php +++ b/src/wp-includes/canonical.php @@ -360,10 +360,6 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { else unset($redirect['port']); - if ( ! empty( $user_home['scheme'] ) && $user_home['scheme'] === 'https' ) { - $redirect['scheme'] = 'https'; - } - // trailing /index.php $redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']); @@ -421,7 +417,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { ( strtolower($original['host']) != 'www.' . strtolower($redirect['host']) && 'www.' . strtolower($original['host']) != strtolower($redirect['host']) ) ) $redirect['host'] = $original['host']; - $compare_original = array( $original['scheme'], $original['host'], $original['path'] ); + $compare_original = array( $original['host'], $original['path'] ); if ( !empty( $original['port'] ) ) $compare_original[] = $original['port']; @@ -429,7 +425,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { if ( !empty( $original['query'] ) ) $compare_original[] = $original['query']; - $compare_redirect = array( $redirect['scheme'], $redirect['host'], $redirect['path'] ); + $compare_redirect = array( $redirect['host'], $redirect['path'] ); if ( !empty( $redirect['port'] ) ) $compare_redirect[] = $redirect['port'];