Changeset 38728 for branches/4.6/src/wp-includes/class-requests.php

Timestamp:

10/05/2016 03:26:37 AM (7 years ago)

Author:

dd32

Message:

HTTP: Update Requests to master (0048f3c) which fixes a number of outstanding issues.

Merges [38727] to the 4.6 branch.

Fixes #38070, #37733 by reverting part of [38429] and using the fix in Requests.
Fixes #37992 allowing for connecting to SSL resources on ports other than 443.
Fixes #37991 by not sending default ports in the Host: header.
Fixes #37839 to match and decode Chunked responses correctly.
Fixes #38232 allowing a SSL connection to ignore the hostname of the certificate when verification is disabled.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-includes/class-requests.php (modified) (2 diffs)

branches/4.6/src/wp-includes/class-requests.php

@@ -750 +750 @@
      */
     protected static function decode_chunked($data) {
-        if (!preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($data))) {
+        if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
             return $data;
         }
+
+
 
         $decoded = '';
@@ -758 +760 @@
 
         while (true) {
-            $is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches);
+            $is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
             if (!$is_chunked) {
                 // Looks like it's not chunked after all