Changeset 30090 for trunk/src/wp-includes/canonical.php

Timestamp:

10/29/2014 06:36:41 PM (10 years ago)

Author:

johnbillion

Message:

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.

File:

• trunk/src/wp-includes/canonical.php (modified) (3 diffs)

trunk/src/wp-includes/canonical.php

@@ -361 +361 @@
         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']);
@@ -422 +418 @@
         $redirect['host'] = $original['host'];
 
-    $compare_original = array( $original['scheme'], $original['host'], $original['path'] );
+    $compare_original = array( $original['host'], $original['path'] );
 
     if ( !empty( $original['port'] ) )
@@ -430 +426 @@
         $compare_original[] = $original['query'];
 
-    $compare_redirect = array( $redirect['scheme'], $redirect['host'], $redirect['path'] );
+    $compare_redirect = array( $redirect['host'], $redirect['path'] );
 
     if ( !empty( $redirect['port'] ) )