Changeset 38727

Timestamp:

10/05/2016 03:23:54 AM (10 years ago)

Author:

dd32

Message:

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

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:

trunk/src/wp-includes

Files:

• Requests/IRI.php (modified) (1 diff)
• Requests/Transport/cURL.php (modified) (2 diffs)
• Requests/Transport/fsockopen.php (modified) (3 diffs)
• class-http.php (modified) (2 diffs)
• class-requests.php (modified) (2 diffs)

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

@@ -689 +689 @@
                 if ($this->ipath !== '' &&
                         (
-                                $isauthority && (
-                                        $this->ipath[0] !== '/' ||
-                                        substr($this->ipath, 0, 2) === '//'
-                                ) ||
+                                $isauthority && $this->ipath[0] !== '/' ||
                                 (
                                         $this->scheme === null &&

trunk/src/wp-includes/Requests/Transport/cURL.php

@@ -376 +376 @@
                 curl_setopt($this->handle, CURLOPT_REFERER, $url);
                 curl_setopt($this->handle, CURLOPT_USERAGENT, $options['useragent']);
-                curl_setopt($this->handle, CURLOPT_HTTPHEADER, $headers);
-
+                if (!empty($headers)) {
+                        curl_setopt($this->handle, CURLOPT_HTTPHEADER, $headers);
+                }
                 if ($options['protocol_version'] === 1.1) {
                         curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
@@ -459 +460 @@
          * @return integer Length of provided data
          */
-        protected function stream_body($handle, $data) {
+        public function stream_body($handle, $data) {
                 $this->hooks->dispatch('request.progress', array($data, $this->response_bytes, $this->response_byte_limit));
                 $data_length = strlen($data);

trunk/src/wp-includes/Requests/Transport/fsockopen.php

@@ -71 +71 @@
                 if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https') {
                         $remote_socket = 'ssl://' . $host;
-                        $url_parts['port'] = 443;
+                        if (!isset($url_parts['port'])) {
+                                $url_parts['port'] = 443;
+                        }
 
                         $context_options = array(
@@ -98 +100 @@
 
                         if (isset($options['verifyname']) && $options['verifyname'] === false) {
+                                $context_options['verify_peer_name'] = false;
                                 $verifyname = false;
                         }
@@ -172 +175 @@
                         $out .= sprintf('Host: %s', $url_parts['host']);
 
-                        if ($url_parts['port'] !== 80) {
+                        if (( 'http' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 80 ) || ( 'https' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 443 )) {
                                 $out .= ':' . $url_parts['port'];
                         }

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

@@ -329 +329 @@
                 if ( ! $r['sslverify'] ) {
                         $options['verify'] = false;
+                        $options['verifyname'] = false;
                 } else {
                         $options['verify'] = $r['sslcertificates'];
@@ -358 +359 @@
                         }
                 }
-
-                // Work around a bug in Requests when the path starts with // See https://github.com/rmccue/Requests/issues/231
-                $url = preg_replace( '!^(\w+://[^/]+)//(.*)$!i', '$1/$2', $url );
 
                 try {

trunk/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