Ticket #33978: 33978.patch

src/wp-includes/class-wp-http-curl.php

@@ -133 +133 @@
                 curl_setopt( $handle, CURLOPT_RETURNTRANSFER, true );
                 curl_setopt( $handle, CURLOPT_SSL_VERIFYHOST, ( $ssl_verify === true ) ? 2 : false );
                 curl_setopt( $handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify );
-                curl_setopt( $handle, CURLOPT_CAINFO, $r['sslcertificates'] );
+
+                if ( $ssl_verify ) {
+                        curl_setopt( $handle, CURLOPT_CAINFO, $r['sslcertificates'] );
+                }
+
                 curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
 
                 /*

tests/phpunit/tests/http/base.php

@@ -14 +14 @@
         // You can use your own version of data/WPHTTP-testcase-redirection-script.php here.
         var $redirection_script = 'http://api.wordpress.org/core/tests/1.0/redirection.php';
 
+        protected $http_request_args;
+
         function setUp() {
 
                 if ( is_callable( array('WP_Http', '_getTransport') ) ) {
@@ -41 +43 @@
                 parent::tearDown();
         }
 
+        function filter_http_request_args( array $args ) {
+                $this->http_request_args = $args;
+                return $args;
+        }
+
         function test_redirect_on_301() {
                 // 5 : 5 & 301
                 $res = wp_remote_request($this->redirection_script . '?code=301&rt=' . 5, array('redirection' => 5) );
@@ -283 +290 @@
         }
 
         /**
+         * Test HTTP requests where SSL verification is disabled but the CA bundle is still populated
+         *
+         * @ticket 33978
+         */
+        function test_https_url_without_ssl_verification() {
+                $url = 'https://wordpress.org/';
+                $args = array(
+                        'sslverify' => false,
+                );
+
+                add_filter( 'http_request_args', array( $this, 'filter_http_request_args' ) );
+
+                $res = wp_remote_head( $url, $args );
+
+                remove_filter( 'http_request_args', array( $this, 'filter_http_request_args' ) );
+
+                $this->assertNotEmpty( $this->http_request_args['sslcertificates'] );
+                $this->assertNotWPError( $res );
+        }
+
+        /**
          * Test HTTP Redirects with multiple Location headers specified
          *
          * @ticket 16890

tests/phpunit/includes/testcase.php

@@ -301 +301 @@
                 $this->assertInstanceOf( 'WP_Error', $actual, $message );
         }
 
+        function assertNotWPError( $actual, $message = '' ) {
+                if ( is_wp_error( $actual ) && '' === $message ) {
+                        $message = $actual->get_error_message();
+                }
+                $this->assertNotInstanceOf( 'WP_Error', $actual, $message );
+        }
+
         function assertEqualFields( $object, $fields ) {
                 foreach( $fields as $field_name => $field_value ) {
                         if ( $object->$field_name != $field_value ) {