Changeset 40068

Timestamp:

02/17/2017 05:05:03 AM (8 years ago)

Author:

dd32

Message:

HTTP API: Restore backwards compatibility with the http_api_curl filter - it expects that the handle parameter is passed as a reference, however [39212] missed that.

Props pento.
Fixes #39783.

Location:

trunk

Files:

• src/wp-includes/class-wp-http-requests-hooks.php (modified) (1 diff)
• tests/phpunit/tests/http/curl.php (modified) (1 diff)

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

@@ -55 +55 @@
             case 'curl.before_send':
                 /** This action is documented in wp-includes/class-wp-http-curl.php */
-                do_action_ref_array( 'http_api_curl', array( $parameters[0], $this->request, $this->url ) );
+                do_action_ref_array( 'http_api_curl', array( &$parameters[0], $this->request, $this->url ) );
                 break;
         }

trunk/tests/phpunit/tests/http/curl.php

@@ -9 +9 @@
 class Tests_HTTP_curl extends WP_HTTP_UnitTestCase {
     var $transport = 'curl';
+
+    /**
+     * @ticket 39783
+     */
+    public function test_http_api_curl_stream_parameter_is_a_reference() {
+        add_action( 'http_api_curl', array( $this, '_action_test_http_api_curl_stream_parameter_is_a_reference' ), 10, 3 );
+        wp_remote_request( $this->fileStreamUrl, array( 'stream' => true, 'timeout' => 30 ) );
+        remove_action( 'http_api_curl', array( $this, '_action_test_http_api_curl_stream_parameter_is_a_reference' ), 10 );
+    }
+
+    public function _action_test_http_api_curl_stream_parameter_is_a_reference( &$stream, $r, $url ) {
+        // $stream not being a reference will cause a PHP warning.
+        // For counting tests purposes, let's do a fake assert.
+        $this->assertTrue( true );
+    }
 }