Ticket #37456: 37456.diff

src/wp-includes/class-http.php

@@ -303 +303 @@
                 $options = array(
                         'timeout' => $r['timeout'],
                         'useragent' => $r['user-agent'],
                         'blocking' => $r['blocking'],
                         'hooks' => new Requests_Hooks(),
                 );
 
                 // Ensure redirects follow browser behaviour.
                 $options['hooks']->register( 'requests.before_redirect', array( get_class(), 'browser_redirect_compatibility' ) );
 
                 if ( $r['stream'] ) {
                         $options['filename'] = $r['filename'];
                 }
                 if ( empty( $r['redirection'] ) ) {
                         $options['follow_redirects'] = false;
-                }
-                else {
+                } else {
                         $options['redirects'] = $r['redirection'];
                 }
 
                 // Use byte limit, if we can
                 if ( isset( $r['limit_response_size'] ) ) {
                         $options['max_bytes'] = $r['limit_response_size'];
                 }
 
                 // If we've got cookies, use them
                 if ( ! empty( $r['cookies'] ) ) {
                         $options['cookies'] = $r['cookies'];
                 }
 
                 // SSL certificate handling
                 if ( ! $r['sslverify'] ) {
                         $options['verify'] = false;
-                }
-                else {
+                } else {
                         $options['verify'] = $r['sslcertificates'];
                 }
 
+                // Pass through the data format settings for args if supplied
+                if ( isset( $r['data_format'] ) ) {
+                        $options['data_format'] = $r['data_format'];
+                }
+
                 /**
                  * Filters whether SSL should be verified for non-local requests.
                  *
                  * @since 2.8.0
                  *
                  * @param bool $ssl_verify Whether to verify the SSL connection. Default true.
                  */
                 $options['verify'] = apply_filters( 'https_ssl_verify', $options['verify'] );
 
                 // Check for proxies.
                 $proxy = new WP_HTTP_Proxy();
                 if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
                         $options['proxy'] = new Requests_Proxy_HTTP( $proxy->host() . ':' . $proxy->port() );
 
                         if ( $proxy->use_authentication() ) {
@@ -524 +527 @@
         }
 
         /**
          * Uses the POST HTTP method.
          *
          * Used for sending data that is expected to be in the body.
          *
          * @access public
          * @since 2.7.0
          *
          * @param string       $url  The request URL.
          * @param string|array $args Optional. Override the defaults.
          * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
          */
         public function post($url, $args = array()) {
-                $defaults = array('method' => 'POST');
+                $defaults = array(
+                        'method' => 'POST',
+                        'data_format' => 'body',
+                );
                 $r = wp_parse_args( $args, $defaults );
                 return $this->request($url, $r);
         }
 
         /**
          * Uses the GET HTTP method.
          *
          * Used for sending data that is expected to be in the body.
          *
          * @access public
          * @since 2.7.0
          *
          * @param string $url The request URL.
          * @param string|array $args Optional. Override the defaults.
          * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
          */
         public function get($url, $args = array()) {
-                $defaults = array('method' => 'GET');
+                $defaults = array(
+                        'method' => 'GET',
+                        'data_format' => 'query',
+                );
                 $r = wp_parse_args( $args, $defaults );
                 return $this->request($url, $r);
         }
 
         /**
          * Uses the HEAD HTTP method.
          *
          * Used for sending data that is expected to be in the body.
          *
          * @access public
          * @since 2.7.0
          *
          * @param string $url The request URL.
          * @param string|array $args Optional. Override the defaults.
          * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
          */
         public function head($url, $args = array()) {
-                $defaults = array('method' => 'HEAD');
+                $defaults = array(
+                        'method' => 'GET',
+                        'data_format' => 'query',
+                );
                 $r = wp_parse_args( $args, $defaults );
                 return $this->request($url, $r);
         }
 
         /**
          * Parses the responses and splits the parts into headers and body.
          *
          * @access public
          * @static
          * @since 2.7.0
          *
          * @param string $strResponse The full response string
          * @return array Array with 'headers' and 'body' keys.
          */
         public static function processResponse($strResponse) {