From cbdffc4a1e7db3c00325cd3767f15fd270671199 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Mon, 8 Apr 2019 05:32:51 +0000
Subject: [PATCH] HTTP: Add support for the `host-only` flag to
 `Wp_Http_Cookie`.

Props soulseekah.
Fixes #43231.

Built from https://develop.svn.wordpress.org/trunk@45135


git-svn-id: http://core.svn.wordpress.org/trunk@44944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-http.php                    |  2 +-
 wp-includes/class-wp-http-cookie.php          | 24 +++++++++++++------
 .../class-wp-http-requests-response.php       | 11 +++++----
 wp-includes/version.php                       |  2 +-
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index 8917b90c1d..2a458eb705 100644
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -449,7 +449,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() );
+				$cookie_jar[ $value->name ] = new Requests_Cookie( $value->name, $value->value, $value->get_attributes(), array( 'host-only' => $value->host_only ) );
 			} elseif ( is_scalar( $value ) ) {
 				$cookie_jar[ $name ] = new Requests_Cookie( $name, $value );
 			}
diff --git a/wp-includes/class-wp-http-cookie.php b/wp-includes/class-wp-http-cookie.php
index 568fe4848a..c265540323 100644
--- a/wp-includes/class-wp-http-cookie.php
+++ b/wp-includes/class-wp-http-cookie.php
@@ -60,6 +60,14 @@ class WP_Http_Cookie {
 	 */
 	public $domain;
 
+	/**
+	 * host-only flag.
+	 *
+	 * @since 5.2.0
+	 * @var bool
+	 */
+	public $host_only;
+
 	/**
 	 * Sets up this cookie object.
 	 *
@@ -67,16 +75,18 @@ class WP_Http_Cookie {
 	 * or a header string detailing it.
 	 *
 	 * @since 2.8.0
+	 * @since 5.2.0 Added `host_only` to the `$data` parameter.
 	 *
 	 * @param string|array $data {
 	 *     Raw cookie data as header string or data array.
 	 *
-	 *     @type string     $name    Cookie name.
-	 *     @type mixed      $value   Value. Should NOT already be urlencoded.
-	 *     @type string|int $expires Optional. Unix timestamp or formatted date. Default null.
-	 *     @type string     $path    Optional. Path. Default '/'.
-	 *     @type string     $domain  Optional. Domain. Default host of parsed $requested_url.
-	 *     @type int        $port    Optional. Port. Default null.
+	 *     @type string     $name      Cookie name.
+	 *     @type mixed      $value     Value. Should NOT already be urlencoded.
+	 *     @type string|int $expires   Optional. Unix timestamp or formatted date. Default null.
+	 *     @type string     $path      Optional. Path. Default '/'.
+	 *     @type string     $domain    Optional. Domain. Default host of parsed $requested_url.
+	 *     @type int        $port      Optional. Port. Default null.
+	 *     @type bool       $host_only Optional. host-only storage flag. Default true.
 	 * }
 	 * @param string       $requested_url The URL which the cookie was set on, used for default $domain
 	 *                                    and $port values.
@@ -128,7 +138,7 @@ class WP_Http_Cookie {
 			}
 
 			// Set properties based directly on parameters.
-			foreach ( array( 'name', 'value', 'path', 'domain', 'port' ) as $field ) {
+			foreach ( array( 'name', 'value', 'path', 'domain', 'port', 'host_only' ) as $field ) {
 				if ( isset( $data[ $field ] ) ) {
 					$this->$field = $data[ $field ];
 				}
diff --git a/wp-includes/class-wp-http-requests-response.php b/wp-includes/class-wp-http-requests-response.php
index df0957f6ff..b6c5f24a96 100644
--- a/wp-includes/class-wp-http-requests-response.php
+++ b/wp-includes/class-wp-http-requests-response.php
@@ -164,11 +164,12 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 		foreach ( $this->response->cookies as $cookie ) {
 			$cookies[] = new WP_Http_Cookie(
 				array(
-					'name'    => $cookie->name,
-					'value'   => urldecode( $cookie->value ),
-					'expires' => isset( $cookie->attributes['expires'] ) ? $cookie->attributes['expires'] : null,
-					'path'    => isset( $cookie->attributes['path'] ) ? $cookie->attributes['path'] : null,
-					'domain'  => isset( $cookie->attributes['domain'] ) ? $cookie->attributes['domain'] : null,
+					'name'      => $cookie->name,
+					'value'     => urldecode( $cookie->value ),
+					'expires'   => isset( $cookie->attributes['expires'] ) ? $cookie->attributes['expires'] : null,
+					'path'      => isset( $cookie->attributes['path'] ) ? $cookie->attributes['path'] : null,
+					'domain'    => isset( $cookie->attributes['domain'] ) ? $cookie->attributes['domain'] : null,
+					'host_only' => isset( $cookie->flags['host-only'] ) ? $cookie->flags['host-only'] : null,
 				)
 			);
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b59add579e..ad2cfa0eab 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2-beta1-45134';
+$wp_version = '5.2-beta1-45135';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.