Changeset 38727 for trunk/src/wp-includes/Requests/Transport/fsockopen.php

Timestamp:

10/05/2016 03:23:54 AM (8 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.

File:

• trunk/src/wp-includes/Requests/Transport/fsockopen.php (modified) (3 diffs)

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'];
             }