X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/607b7e02d77e7326161e8ec15639052d2040f745..refs/tags/wordpress-4.6.1:/wp-includes/class-http.php?ds=sidebyside

diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index d3a89378..c0272ba4 100644
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -362,6 +362,9 @@ class WP_Http {
 			}
 		}
 
+		// 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 {
 			$requests_response = Requests::request( $url, $headers, $data, $type, $options );
 
@@ -433,7 +436,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 );
 			}
 		}