Ticket #37843: 37843.2.diff

src/wp-includes/class-http.php

@@ -300 +300 @@
                         'timeout' => $r['timeout'],
                         'useragent' => $r['user-agent'],
                         'blocking' => $r['blocking'],
-                        'hooks' => new Requests_Hooks(),
+                        'hooks' => new WP_Requests_Hooks( $url, $r ),
                 );
 
                 // Ensure redirects follow browser behaviour.

src/wp-includes/class-wp-requests-hooks.php

@@ +1 @@
+<?php
+/**
+ * HTTP API: Requests hook bridge class
+ *
+ * @package WordPress
+ * @subpackage HTTP
+ * @since 4.6.0
+ */
+
+/**
+ * Bridge to connect Requests internal hooks to WordPress filters.
+ *
+ * @package WordPress
+ * @subpackage HTTP
+ * @since 4.6.0
+ */
+class WP_Requests_Hooks extends Requests_Hooks {
+        /**
+         * Request URL.
+         *
+         * @var string Request URL.
+         */
+        protected $url;
+
+        /**
+         * WordPress request data.
+         *
+         * @var array Request data in WP_Http format.
+         */
+        protected $request = array();
+
+        /**
+         * Constructor.
+         *
+         * @param string $url URL to request.
+         * @param array $request Request data in WP_Http format.
+         */
+        public function __construct( $url, $request ) {
+                $this->url = $url;
+                $this->request = $request;
+        }
+
+        /**
+         * Dispatch a message.
+         *
+         * @param string $hook Hook name.
+         * @param array $parameters Parameters to pass to callbacks.
+         * @return boolean True if hooks were run, false if nothing was hooked.
+         */
+        public function dispatch( $hook, $parameters = array() ) {
+                $result = parent::dispatch( $hook, $parameters );
+
+                // Dispatch native WordPress hooks.
+                $this->dispatch_native_hook( $hook, $parameters );
+
+                return $result;
+        }
+
+        /**
+         * Dispatch native WordPress hooks.
+         *
+         * @param string $hook Requests hook name.
+         * @param array $parameters Parameters to pass to callbacks.
+         */
+        public function dispatch_native_hook( $hook, $parameters ) {
+                switch ( $hook ) {
+                        case 'curl.before_send':
+                                do_action_ref_array( 'http_api_curl', array( $parameters[0], $this->request, $this->url ) );
+                                break;
+                }
+
+                /**
+                 * Handle native internal Requests actions.
+                 *
+                 * Requests fires actions internally, but those are not usable in
+                 * regular WordPress actions. This action maps Requests internal hooks
+                 * to native WordPress hooks.
+                 *
+                 * @param array $parameters Parameters from Requests internal hook.
+                 */
+                do_action_ref_array( "requests-{$hook}", $parameters );
+        }
+}

src/wp-settings.php

@@ -207 +207 @@
 require( ABSPATH . WPINC . '/class-wp-http-encoding.php' );
 require( ABSPATH . WPINC . '/class-wp-http-response.php' );
 require( ABSPATH . WPINC . '/class-wp-http-requests-response.php' );
+require( ABSPATH . WPINC . '/class-wp-requests-hooks.php' );
 require( ABSPATH . WPINC . '/widgets.php' );
 require( ABSPATH . WPINC . '/class-wp-widget.php' );
 require( ABSPATH . WPINC . '/class-wp-widget-factory.php' );