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

Timestamp:

11/04/2025 06:29:36 PM (6 months ago)

Author:

johnjamesjacoby

Message:

Canonical: prevent "Undefined array key" PHP warnings when host is not set.

This change is necessary to prevent scanning tools from polluting debug/error logs of some hosting configurations with PHP warnings simply by omitting the Host header from their requests.

This commit makes sure that all of the required host, path, query, and scheme array keys inside of the redirect_canonical() function are always set after various operations have been performed on them.

It also includes 1 new test case and 2 additional tests, to verify the problem and its fix are working as intended, as well as a small modification to the get_canonical() phpunit helper specifically to account for HTTP_HOST maybe not being set.

Props artz91, johnjamesjacoby, mindctrl, sirlouen.

Fixes #63316.

File:

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

trunk/src/wp-includes/canonical.php

@@ -78 +78 @@
     }
 
+    // Notice fixing.
+    $original += array(
+        'host'   => '',
+        'path'   => '',
+        'query'  => '',
+        'scheme' => '',
+    );
+
     $redirect     = $original;
     $redirect_url = false;
     $redirect_obj = false;
-
-    // Notice fixing.
-    if ( ! isset( $redirect['path'] ) ) {
-        $redirect['path'] = '';
-    }
-    if ( ! isset( $redirect['query'] ) ) {
-        $redirect['query'] = '';
-    }
 
     /*
@@ -617 +617 @@
 
     // Notice prevention after new parse_url( $redirect_url ) calls
-    if ( ! isset( $redirect['path'] ) ) {
-        $redirect['path'] = '';
-    }
-    if ( ! isset( $redirect['query'] ) ) {
-        $redirect['query'] = '';
-    }
+    $redirect += array(
+        'host'   => '',
+        'path'   => '',
+        'query'  => '',
+        'scheme' => '',
+    );
 
     // Trailing /index.php.