WordPress 4.6.2-scripts

[autoinstalls/wordpress.git] / wp-includes / Requests / Transport / cURL.php

diff --git a/wp-includes/Requests/Transport/cURL.php b/wp-includes/Requests/Transport/cURL.php
index 453f73b7300bdb150c635b8b1156522066c22c20..4429edb647321c18bcd6bc44cce025a868fae1af 100644 (file)
--- a/wp-includes/Requests/Transport/cURL.php
+++ b/wp-includes/Requests/Transport/cURL.php
@@ -347,7 +347,7 @@ class Requests_Transport_cURL implements Requests_Transport {
                        default:
                                curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
                                if (!empty($data)) {
-                                       curl_setopt( $this->handle, CURLOPT_POSTFIELDS, $data );
+                                       curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
                                }
                }
 
@@ -375,8 +375,9 @@ class Requests_Transport_cURL implements Requests_Transport {
                curl_setopt($this->handle, CURLOPT_URL, $url);
                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);
                }
@@ -458,7 +459,7 @@ class Requests_Transport_cURL implements Requests_Transport {
         * @param string $data Body data
         * @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);
 
@@ -524,7 +525,7 @@ class Requests_Transport_cURL implements Requests_Transport {
         * @return boolean True if the transport is valid, false otherwise.
         */
        public static function test($capabilities = array()) {
-               if (!function_exists('curl_init') && !function_exists('curl_exec')) {
+               if (!function_exists('curl_init') || !function_exists('curl_exec')) {
                        return false;
                }