Changeset 50842 for trunk/src/wp-includes/Requests/IPv6.php

Timestamp:

05/11/2021 07:40:41 PM (4 years ago)

Author:

desrosj

Message:

External Libraries: Update the Requests library to version 1.8.0.

While some of the changes in the 1.8.0 release have already been copied to WordPress Core in earlier releases (see [38727], [46258], [47902] and [49382]), this release contains additional improvements, including:

• A significant performance fix when using cURL.
• Improved compliance with RFC2616.

The library has also been moved under the WordPress project’s GitHub organization and can now be found at ​https://github.com/WordPress/Requests.

Props jrf, dd32, rmccue, justinahinon, netweb, schlessera, TimothyBJacobs, soulseekah, ozh, skithund, carlalexander, travisnorthcutt, desrosj.
Fixes #53101.

File:

• trunk/src/wp-includes/Requests/IPv6.php (modified) (5 diffs)

trunk/src/wp-includes/Requests/IPv6.php

@@ -41 +41 @@
 
         list($ip1, $ip2) = explode('::', $ip);
-        $c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
-        $c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
+        $c1              = ($ip1 === '') ? -1 : substr_count($ip1, ':');
+        $c2              = ($ip2 === '') ? -1 : substr_count($ip2, ':');
 
         if (strpos($ip2, '.') !== false) {
@@ -52 +52 @@
         }
         // ::xxx
-        else if ($c1 === -1) {
+        elseif ($c1 === -1) {
             $fill = str_repeat('0:', 7 - $c2);
-            $ip = str_replace('::', $fill, $ip);
+            $ip   = str_replace('::', $fill, $ip);
         }
         // xxx::
-        else if ($c2 === -1) {
+        elseif ($c2 === -1) {
             $fill = str_repeat(':0', 7 - $c1);
-            $ip = str_replace('::', $fill, $ip);
+            $ip   = str_replace('::', $fill, $ip);
         }
         // xxx::xxx
         else {
             $fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
-            $ip = str_replace('::', $fill, $ip);
+            $ip   = str_replace('::', $fill, $ip);
         }
         return $ip;
@@ -85 +85 @@
     public static function compress($ip) {
         // Prepare the IP to be compressed
-        $ip = self::uncompress($ip);
+        $ip       = self::uncompress($ip);
         $ip_parts = self::split_v6_v4($ip);
 
@@ -127 +127 @@
     protected static function split_v6_v4($ip) {
         if (strpos($ip, '.') !== false) {
-            $pos = strrpos($ip, ':');
+            $pos       = strrpos($ip, ':');
             $ipv6_part = substr($ip, 0, $pos);
             $ipv4_part = substr($ip, $pos + 1);
@@ -146 +146 @@
      */
     public static function check_ipv6($ip) {
-        $ip = self::uncompress($ip);
+        $ip                = self::uncompress($ip);
         list($ipv6, $ipv4) = self::split_v6_v4($ip);
-        $ipv6 = explode(':', $ipv6);
-        $ipv4 = explode('.', $ipv4);
+        $ipv6              = explode(':', $ipv6);
+        $ipv4              = explode('.', $ipv4);
         if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
             foreach ($ipv6 as $ipv6_part) {