Changeset 50842 for trunk/src/wp-includes/Requests/Cookie.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/Cookie.php (modified) (8 diffs)

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

@@ -66 +66 @@
      */
     public function __construct($name, $value, $attributes = array(), $flags = array(), $reference_time = null) {
-        $this->name = $name;
-        $this->value = $value;
+        $this->name       = $name;
+        $this->value      = $value;
         $this->attributes = $attributes;
-        $default_flags = array(
-            'creation' => time(),
+        $default_flags    = array(
+            'creation'    => time(),
             'last-access' => time(),
-            'persistent' => false,
-            'host-only' => true,
+            'persistent'  => false,
+            'host-only'   => true,
         );
-        $this->flags = array_merge($default_flags, $flags);
+        $this->flags      = array_merge($default_flags, $flags);
 
         $this->reference_time = time();
@@ -229 +229 @@
         foreach ($this->attributes as $key => $value) {
             $orig_value = $value;
-            $value = $this->normalize_attribute($key, $value);
+            $value      = $this->normalize_attribute($key, $value);
             if ($value === null) {
                 unset($this->attributes[$key]);
@@ -386 +386 @@
      */
     public static function parse($string, $name = '', $reference_time = null) {
-        $parts = explode(';', $string);
+        $parts   = explode(';', $string);
         $kvparts = array_shift($parts);
 
@@ -398 +398 @@
             //
             // https://bugzilla.mozilla.org/show_bug.cgi?id=169091
-            $name = '';
+            $name  = '';
             $value = $kvparts;
         }
@@ -404 +404 @@
             list($name, $value) = explode('=', $kvparts, 2);
         }
-        $name = trim($name);
+        $name  = trim($name);
         $value = trim($value);
 
@@ -413 +413 @@
             foreach ($parts as $part) {
                 if (strpos($part, '=') === false) {
-                    $part_key = $part;
+                    $part_key   = $part;
                     $part_value = true;
                 }
                 else {
                     list($part_key, $part_value) = explode('=', $part, 2);
-                    $part_value = trim($part_value);
-                }
-
-                $part_key = trim($part_key);
+                    $part_value                  = trim($part_value);
+                }
+
+                $part_key              = trim($part_key);
                 $attributes[$part_key] = $part_value;
             }
@@ -450 +450 @@
             if (empty($parsed->attributes['domain']) && !empty($origin)) {
                 $parsed->attributes['domain'] = $origin->host;
-                $parsed->flags['host-only'] = true;
+                $parsed->flags['host-only']   = true;
             }
             else {
@@ -498 +498 @@
      * @codeCoverageIgnore
      * @deprecated Use {@see Requests_Cookie::parse_from_headers}
-     * @return string
+     * @return array
      */
     public static function parseFromHeaders(Requests_Response_Headers $headers) {