From a79636f82a802abff6fb65158b190f8a3cdb18f9 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 17 Dec 2019 15:25:01 +0000
Subject: [PATCH] Docs: Correct `@type` for `timeout` argument in
 `WP_Http::request()`.

Props georgestephanis, benedictsinger.
Fixes #49005.
Built from https://develop.svn.wordpress.org/trunk@46970


git-svn-id: http://core.svn.wordpress.org/trunk@46770 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-http.php | 4 ++--
 wp-includes/version.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index d7a4a6f1f4..a961808ff3 100644
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -109,7 +109,7 @@ class WP_Http {
 	 *                                             'TRACE', 'OPTIONS', or 'PATCH'.
 	 *                                             Some transports technically allow others, but should not be
 	 *                                             assumed. Default 'GET'.
-	 *     @type int          $timeout             How long the connection should stay open in seconds. Default 5.
+	 *     @type float        $timeout             How long the connection should stay open in seconds. Default 5.
 	 *     @type int          $redirection         Number of allowed redirects. Not supported by all transports
 	 *                                             Default 5.
 	 *     @type string       $httpversion         Version of the HTTP protocol to use. Accepts '1.0' and '1.1'.
@@ -155,7 +155,7 @@ class WP_Http {
 			 * @since 2.7.0
 			 * @since 5.1.0 The `$url` parameter was added.
 			 *
-			 * @param int    $timeout_value Time in seconds until a request times out. Default 5.
+			 * @param float  $timeout_value Time in seconds until a request times out. Default 5.
 			 * @param string $url           The request URL.
 			 */
 			'timeout'             => apply_filters( 'http_request_timeout', 5, $url ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5e14c252fb..1068044332 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-46969';
+$wp_version = '5.4-alpha-46970';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.