HTTP: Improve detection of valid IP addresses.

Built from https://develop.svn.wordpress.org/trunk@37115 git-svn-id: http://core.svn.wordpress.org/trunk@37082 1a063a9b-81f0-0310-95a4-ce76da25c4cd
WordPress · Mar 30, 2016 · af9f052 · af9f052
1 parent 9e4415b
commit af9f052
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/wp-includes/http.php b/wp-includes/http.php
@@ -523,15 +523,15 @@ function wp_http_validate_url( $url ) {
 
 	$parsed_home = @parse_url( get_option( 'home' ) );
 
-	if ( isset( $parsed_home['host'] ) ) { 
+	if ( isset( $parsed_home['host'] ) ) {
 		$same_host = ( strtolower( $parsed_home['host'] ) === strtolower( $parsed_url['host'] ) || 'localhost' === strtolower( $parsed_url['host'] ) );
 	} else {
 		$same_host = false;
 	}
 
 	if ( ! $same_host ) {
 		$host = trim( $parsed_url['host'], '.' );
-		if ( preg_match( '#^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $host ) ) {
+		if ( preg_match( '#^(([1-9]?\d|1\d\d|25[0-5]|2[0-4]\d)\.){3}([1-9]?\d|1\d\d|25[0-5]|2[0-4]\d)$#', $host ) ) {
 			$ip = $host;
 		} else {
 			$ip = gethostbyname( $host );

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-RC1-37114';
+$wp_version = '4.5-RC1-37115';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.