Changeset 25149

Timestamp:

08/28/2013 04:53:41 AM (11 years ago)

Author:

dd32

Message:

WP_HTTP: More relaxed host matching for WP_PROXY_BYPASS_HOSTS and WP_ACCESSIBLE_HOSTS, allowing for subdomains in wildcards to include dashes (and anything else which [\w.] didn't catch). Fixes #24201

File:

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

trunk/src/wp-includes/class-http.php

@@ -556 +556 @@
                 $wildcard_regex = array();
                 foreach ( $accessible_hosts as $host )
-                    $wildcard_regex[] = str_replace('\*', '[\w.]+?', preg_quote($host, '/'));
+                    $wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
                 $wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
             }
@@ -1622 +1622 @@
                 $wildcard_regex = array();
                 foreach ( $bypass_hosts as $host )
-                    $wildcard_regex[] = str_replace('\*', '[\w.]+?', preg_quote($host, '/'));
+                    $wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
                 $wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
             }