WordPress 4.6.2

[autoinstalls/wordpress.git] / wp-includes / class-http.php

diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index d3a893787cb18847e7697e35edb0df756aa9f7b9..5a3075846c4a76acefd3f57c5613d04b3c007599 100644 (file)
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -332,6 +332,7 @@ class WP_Http {
                // SSL certificate handling
                if ( ! $r['sslverify'] ) {
                        $options['verify'] = false;
+                       $options['verifyname'] = false;
                } else {
                        $options['verify'] = $r['sslcertificates'];
                }
@@ -362,6 +363,9 @@ class WP_Http {
                        }
                }
 
+               // Avoid issues where mbstring.func_overload is enabled
+               mbstring_binary_safe_encoding();
+
                try {
                        $requests_response = Requests::request( $url, $headers, $data, $type, $options );
 
@@ -376,6 +380,8 @@ class WP_Http {
                        $response = new WP_Error( 'http_request_failed', $e->getMessage() );
                }
 
+               reset_mbstring_encoding();
+
                /**
                 * Fires after an HTTP API response is received and before the response is returned.
                 *
@@ -433,7 +439,7 @@ class WP_Http {
                foreach ( $cookies as $name => $value ) {
                        if ( $value instanceof WP_Http_Cookie ) {
                                $cookie_jar[ $value->name ] = new Requests_Cookie( $value->name, $value->value, $value->get_attributes() );
-                       } elseif ( is_string( $value ) ) {
+                       } elseif ( is_scalar( $value ) ) {
                                $cookie_jar[ $name ] = new Requests_Cookie( $name, $value );
                        }
                }