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

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

@@ -63 +63 @@
             throw new Requests_Exception('Invalid URL.', 'invalidurl', $url);
         }
-        $host = $url_parts['host'];
-        $context = stream_context_create();
-        $verifyname = false;
+        $host                     = $url_parts['host'];
+        $context                  = stream_context_create();
+        $verifyname               = false;
         $case_insensitive_headers = new Requests_Utility_CaseInsensitiveDictionary($headers);
 
@@ -76 +76 @@
 
             $context_options = array(
-                'verify_peer' => true,
-                // 'CN_match' => $host,
-                'capture_peer_cert' => true
+                'verify_peer'       => true,
+                'capture_peer_cert' => true,
             );
-            $verifyname = true;
+            $verifyname      = true;
 
             // SNI, if enabled (OpenSSL >=0.9.8j)
+            // phpcs:ignore PHPCompatibility.Constants.NewConstants.openssl_tlsext_server_nameFound
             if (defined('OPENSSL_TLSEXT_SERVER_NAME') && OPENSSL_TLSEXT_SERVER_NAME) {
                 $context_options['SNI_enabled'] = true;
@@ -92 +92 @@
             if (isset($options['verify'])) {
                 if ($options['verify'] === false) {
-                    $context_options['verify_peer'] = false;
+                    $context_options['verify_peer']      = false;
+                    $context_options['verify_peer_name'] = false;
+                    $verifyname                          = false;
                 }
                 elseif (is_string($options['verify'])) {
@@ -101 +103 @@
             if (isset($options['verifyname']) && $options['verifyname'] === false) {
                 $context_options['verify_peer_name'] = false;
-                $verifyname = false;
+                $verifyname                          = false;
             }
 
@@ -117 +119 @@
         $remote_socket .= ':' . $url_parts['port'];
 
+        // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_set_error_handler
         set_error_handler(array($this, 'connect_error_handler'), E_WARNING | E_NOTICE);
 
@@ -151 +154 @@
 
         $request_body = '';
-        $out = sprintf("%s %s HTTP/%.1F\r\n", $options['type'], $path, $options['protocol_version']);
+        $out          = sprintf("%s %s HTTP/%.1F\r\n", $options['type'], $path, $options['protocol_version']);
 
         if ($options['type'] !== Requests::TRACE) {
             if (is_array($data)) {
-                $request_body = http_build_query($data, null, '&');
+                $request_body = http_build_query($data, '', '&');
             }
             else {
@@ -161 +164 @@
             }
 
-            if (!empty($data)) {
+            // Always include Content-length on POST requests to prevent
+            // 411 errors from some servers when the body is empty.
+            if (!empty($data) || $options['type'] === Requests::POST) {
                 if (!isset($case_insensitive_headers['Content-Length'])) {
                     $headers['Content-Length'] = strlen($request_body);
@@ -175 +180 @@
             $out .= sprintf('Host: %s', $url_parts['host']);
 
-            if (( 'http' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 80 ) || ( 'https' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 443 )) {
+            if ((strtolower($url_parts['scheme']) === 'http' && $url_parts['port'] !== 80) || (strtolower($url_parts['scheme']) === 'https' && $url_parts['port'] !== 443)) {
                 $out .= ':' . $url_parts['port'];
             }
@@ -221 +226 @@
 
         $timeout_sec = (int) floor($options['timeout']);
-        if ($timeout_sec == $options['timeout']) {
+        if ($timeout_sec === $options['timeout']) {
             $timeout_msec = 0;
         }
@@ -229 +234 @@
         stream_set_timeout($socket, $timeout_sec, $timeout_msec);
 
-        $response = $body = $headers = '';
+        $response   = '';
+        $body       = '';
+        $headers    = '';
         $this->info = stream_get_meta_data($socket);
-        $size = 0;
-        $doingbody = false;
-        $download = false;
+        $size       = 0;
+        $doingbody  = false;
+        $download   = false;
         if ($options['filename']) {
             $download = fopen($options['filename'], 'wb');
@@ -249 +256 @@
                 if (strpos($response, "\r\n\r\n")) {
                     list($headers, $block) = explode("\r\n\r\n", $response, 2);
-                    $doingbody = true;
+                    $doingbody             = true;
                 }
             }
@@ -265 +272 @@
                         // Limit the length
                         $limited_length = ($this->max_bytes - $size);
-                        $block = substr($block, 0, $limited_length);
+                        $block          = substr($block, 0, $limited_length);
                     }
                 }
@@ -301 +308 @@
     public function request_multiple($requests, $options) {
         $responses = array();
-        $class = get_class($this);
+        $class     = get_class($this);
         foreach ($requests as $id => $request) {
             try {
-                $handler = new $class();
+                $handler        = new $class();
                 $responses[$id] = $handler->request($request['url'], $request['headers'], $request['data'], $request['options']);
 
@@ -354 +361 @@
             }
 
-            $url_parts['query'] .= '&' . http_build_query($data, null, '&');
-            $url_parts['query'] = trim($url_parts['query'], '&');
+            $url_parts['query'] .= '&' . http_build_query($data, '', '&');
+            $url_parts['query']  = trim($url_parts['query'], '&');
         }
         if (isset($url_parts['path'])) {