Ticket #34883: 34883.diff

wp-includes/class-http.php

@@ -62 +62 @@
          *                                             compressed content is returned in the response anyway, it will
          *                                             need to be separately decompressed. Default true.
          *     @type bool         $sslverify           Whether to verify SSL for the request. Default true.
-         *     @type string       sslcertificates      Absolute path to an SSL certificate .crt file.
+         *     @type string       $sslcertificates     Absolute path to an SSL certificate .crt file.
+         *     @type string       $clientcert          Absolute path to a client certificate in .pem format. Default null.
          *                                             Default ABSPATH . WPINC . '/certificates/ca-bundle.crt'.
          *     @type bool         $stream              Whether to stream to a file. If set to true and no filename was
          *                                             given, it will be droped it in the WP temp dir and its name will

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

@@ -113 +113 @@
 
                 $is_local = isset($r['local']) && $r['local'];
                 $ssl_verify = isset($r['sslverify']) && $r['sslverify'];
+                $ssl_client_cert = isset($r['sslclientcert']) && $r['sslclientcert'];
                 if ( $is_local ) {
                         /** This filter is documented in wp-includes/class-wp-http-streams.php */
                         $ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify );
@@ -137 +138 @@
                 if ( $ssl_verify ) {
                         curl_setopt( $handle, CURLOPT_CAINFO, $r['sslcertificates'] );
                 }
+                if ( $ssl_client_cert ) {
+                        curl_setopt( $handle, CURLOPT_SSLCERT, $r['sslclientcert'] );
+                }
 
                 curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
 

wp-includes/class-wp-http-streams.php

@@ -116 +116 @@
                                 'capture_peer_cert' => $ssl_verify,
                                 'SNI_enabled' => true,
                                 'cafile' => $r['sslcertificates'],
+                                'local_cert' => $r['sslclientcert'],
                                 'allow_self_signed' => ! $ssl_verify,
                         )
                 ) );